macosx: show current pos and remaining or total time in fs controller

[vlc] / include / vlc_network.h

diff --git a/include/vlc_network.h b/include/vlc_network.h
index 8cfc27fd824919ad60fd5fbd9b1392d234fceb43..699e8af039142eefe0523870c8c23130b0c7312a 100644 (file)
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -33,10 +33,8 @@
  */
 
 #if defined( WIN32 )
-#   if !defined(UNDER_CE)
-#       define _NO_OLDNAMES 1
-#       include <io.h>
-#   endif
+#   define _NO_OLDNAMES 1
+#   include <io.h>
 #   include <winsock2.h>
 #   include <ws2tcpip.h>
 #   define net_errno (WSAGetLastError())
@@ -224,6 +222,14 @@ VLC_API ssize_t net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *,
 #ifndef AI_NUMERICSERV
 # define AI_NUMERICSERV 0
 #endif
+#ifndef AI_IDN
+# define AI_IDN 0 /* GNU/libc extension */
+#endif
+
+#ifdef WIN32
+# undef gai_strerror
+# define gai_strerror gai_strerrorA
+#endif
 
 #ifdef __OS2__
 # ifndef NI_NUMERICHOST