Changeset 2c1edcf1f486e4f968e8fa499508c4b7b620e12e

Timestamp:

17/07/05 23:21:04 (3 years ago)

Author:

Cyril Deguet <asmax@videolan.org>

git-committer:

Cyril Deguet <asmax@videolan.org> 1121635264 +0000

git-parent:

[80ee9c71d258094b2b7a83ddeb58c2d13216b64c]

git-author:

Cyril Deguet <asmax@videolan.org> 1121635264 +0000

Message:

* all: compilation fix with vc7.1 compiler, and removed a bunch of warnings (there are still many warnings about size_t/int mismatch though...)

Files:

• include/network.h (modified) (1 diff)
• include/vlc_common.h (modified) (1 diff)
• src/input/var.c (modified) (1 diff)
• src/libvlc.c (modified) (4 diffs)
• src/misc/getaddrinfo.c (modified) (3 diffs)
• src/misc/net.c (modified) (2 diffs)
• src/stream_output/acl.c (modified) (1 diff)
• src/stream_output/sap.c (modified) (1 diff)

include/network.h

@@ -31 +31 @@
-#elif defined( WIN32 )
-#   include <winsock2.h>
+#   include <ws2tcpip.h>
-#elif HAVE_SYS_SOCKET_H
-#   include <sys/socket.h>

include/vlc_common.h

@@ -537 +537 @@
-
-/* Dynamic array handling: realloc array, move data, increment position */
-
+ && _MSC_VER < 1300
-#   define VLCCVP (void**) /* Work-around for broken compiler */
-#else

src/input/var.c

@@ -476 +476 @@
-{
-    input_thread_t *p_input = (input_thread_t*)p_this;
-    vlc_value_t val;
-    int i_rate;
-
-    /* Problem with this way: the "rate" variable is update after the input thread do the change */

src/libvlc.c

@@ -248 +248 @@
-    char *       psz_parser;
-    char *       psz_control;
-    char *       psz_language;
-    vlc_bool_t   b_exit = VLC_FALSE;
-    vlc_t *      p_vlc = vlc_current_object( i_object );
@@ -254 +253 @@
-    playlist_t  *p_playlist;
-    vlc_value_t  val;
+#ifndef WIN32
+    char *       psz_language;
+#endif
-
-    if( !p_vlc )
@@ -2035 +2037 @@
-            char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
-            char *psz_suf = "", *psz_prefix = NULL;
-in
+size_
-
-            /* Skip deprecated options */
@@ -2168 +2170 @@
-            {
-                char *psz_parser, *psz_word;
-in
+size_
-
-                /* If the remaining text fits in a line, print it. */
-
+(size_t)
-                {
-                    fprintf( stdout, "%s\n", psz_text );

src/misc/getaddrinfo.c

@@ -501 +501 @@
-    char psz_servbuf[6], *psz_serv;
-    int i_servlen, i_val;
-
-    flags |= NI_NUMERICSERV;
-    if( portnum != NULL )
-    {
-        psz_serv = psz_servbuf;
-        i_servlen = sizeof( psz_servbuf );
-    }
-    else
-    {
-        psz_serv = NULL;
-        i_servlen = 0;
-    }
-#ifdef WIN32
-    /*
@@ -522 +510 @@
-    HINSTANCE wship6_module;
-    GETNAMEINFO ws2_getnameinfo;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    wship6_module = LoadLibrary( "wship6.dll" );
-    if( wship6_module != NULL )
@@ -555 +556 @@
-        vlc_mutex_lock( lock.p_address );
-#else
-
+//
-#endif
-        i_val = __getnameinfo( sa, salen, host, hostlen, psz_serv, i_servlen,

src/misc/net.c

@@ -43 +43 @@
-#       undef sockaddr_storage
-#   endif
+#   include <io.h>
-#   include <winsock2.h>
-#   include <ws2tcpip.h>
@@ -129 +130 @@
-    {
-        i_val = PROTECTION_LEVEL_UNRESTRICTED;
- &i_val,
-
+
+(const char*)&i_val,
-    }
-# else

src/stream_output/acl.c

@@ -67 +67 @@
-                        const char *psz_ip )
-{
- = { }
+
-    int i_family;
-

src/stream_output/sap.c

@@ -353 +353 @@
-    }
-    else
-=
+
-
-    msg_Dbg( p_sap, "using SAP address: %s", p_method->psz_address);