Changeset 5c8349780e66ff4baaab082de1de3d85e5c244ae

Timestamp:

10/09/05 00:10:57 (3 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1126303857 +0000

git-parent:

[5c0dd04bc176082a61302843720ace271b344811]

git-author:

Gildas Bazin <gbazin@videolan.org> 1126303857 +0000

Message:

* configure.ac, src/extras/libc.c, modules/misc/network/ipv4.c: fixed the WinCE build.

Files:

• configure.ac (modified) (3 diffs)
• modules/misc/network/ipv4.c (modified) (3 diffs)
• src/extras/libc.c (modified) (3 diffs)

configure.ac

@@ -172 +172 @@
-        VLC_ADD_LDFLAGS([vcdx cddax],[-lwinmm])
-        VLC_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard stream_out_rtp vod_rtsp telnet netsync],[-lws2_32])
-        VLC_ADD_LDFLAGS([ipv4],[-liphlpapi])
-    fi
-    if test "${SYS}" = "mingwce"; then
@@ -180 +179 @@
-        VLC_ADD_LDFLAGS([vlc],[-lws2 -e WinMainCRTStartup])
-        VLC_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap http netsync],[-lws2])
-         VLC_ADD_LDFLAGS([ipv4],[-liphlpapi])
-   fi
-    ;;
@@ -242 +240 @@
-dnl Iconv stuff
-dnl
+if test "${SYS}" != "mingwce"; then
-AS_IF([test "$am_cv_func_iconv" != "yes"],
-    [AC_MSG_ERROR([libiconv is needed for VLC to work properly])])
+fi
-VLC_ADD_CFLAGS([vlc],[${INCICONV}])
-VLC_ADD_LDFLAGS([vlc],[${LIBICONV}])

modules/misc/network/ipv4.c

@@ -345 +345 @@
-            else
-            {
+                DWORD WINAPI (*OurGetBestInterface)(IPAddr,PDWORD);
+                DWORD WINAPI (*OurGetIpAddrTable)(PMIB_IPADDRTABLE,PULONG,BOOL);
+                HINSTANCE hiphlpapi = LoadLibrary(_T("Iphlpapi.dll"));
-                DWORD i_index;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                {
-                    PMIB_IPADDRTABLE p_table;
@@ -354 +369 @@
-                    msg_Dbg( p_this, "Winsock best interface is %lu",
-                             (unsigned long)i_index );
-
+Our
-
-                    p_table = (PMIB_IPADDRTABLE)malloc( i );
-                    if( p_table != NULL )
-                    {
-GetIpAddrTable( p_table, &i, 0 ) == NO_ERROR
+OurGetIpAddrTable( p_table, &i, 0 ) == NO_ERROR 
-                        {
-                            for( i = 0; i < p_table->dwNumEntries; i-- )
@@ -372 +387 @@
-                            }
-                        }
-
-
+
-                        free( p_table );
-                    }
-                }
-
-
+
+
+
-            }
-#endif

src/extras/libc.c

@@ -56 +56 @@
-#endif
-
+#ifdef UNDER_CE
+#   define strcoll strcmp
+#endif
+
-/*****************************************************************************
- * getenv: just in case, but it should never be called
@@ -344 +348 @@
- * when called with an empty argument or just '\'
- *****************************************************************************/
-|| 
+&& !
-typedef struct vlc_DIR
-{
@@ -950 +954 @@
-    }
-
-
+ && !defined( UNDER_CE )
-    SECURITY_ATTRIBUTES saAttr; 
-    PROCESS_INFORMATION piProcInfo;