Changeset 51002a6c98cafc33e01f06eb2214612d4d983309

Timestamp:

01/10/04 17:56:10 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

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

git-parent:

[5cfa14809653862339f2234893d6883cbed78810]

git-author:

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

Message:

* src/*: WinCE compilation fixes.

Files:

• include/vlc/vlc.h (modified) (1 diff)
• src/misc/configuration.c (modified) (2 diffs)
• src/misc/httpd.c (modified) (2 diffs)
• src/misc/net.c (modified) (9 diffs)
• src/misc/vlm.c (modified) (8 diffs)

include/vlc/vlc.h

@@ -60 +60 @@
-    vlc_list_t *    p_list;
-
-defined( WIN32 ) && !defined( __MINGW32__
+(defined( WIN32 ) && !defined( __MINGW32__ )) || defined( UNDER_CE
-    signed __int64   i_time;
-# else

src/misc/configuration.c

@@ -923 +923 @@
-        if( CreateDirectory( psz_new, NULL ) )
-        {
-file
+dir
-        }
-    }
@@ -1555 +1555 @@
-    typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD,
-                                               LPSTR );
+#ifndef CSIDL_FLAG_CREATE
-#   define CSIDL_FLAG_CREATE 0x8000
+#endif
+#ifndef CSIDL_APPDATA
-#   define CSIDL_APPDATA 0x1A
+#endif
+#ifndef SHGFP_TYPE_CURRENT
-#   define SHGFP_TYPE_CURRENT 0
+#endif
-
-    HINSTANCE shfolder_dll;

src/misc/httpd.c

@@ -30 +30 @@
-
-#include <string.h>
-
+
+
+
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-
+
+
+
+
-
-#if defined( UNDER_CE )
@@ -2338 +2343 @@
-                        &fds_read, &fds_write, NULL, &timeout );
-
+#if defined( WIN32 ) || defined( UNDER_CE )
+        if( i_ret == -1 )
+#else
-        if( i_ret == -1 && errno != EINTR )
+#endif
-        {
-            msg_Warn( host, "cannot select sockets" );

src/misc/net.c

@@ -189 +189 @@
-
-        i_ret = select(fd + 1, &fds_r, NULL, &fds_e, &timeout);
+#ifdef HAVE_ERRNO_H
-        if( (i_ret < 0 && errno == EINTR) || i_ret == 0 )
+#else
+        if( i_ret == 0 )
+#endif
-        {
-            if( b_block ) continue;
@@ -196 +200 @@
-        else if( i_ret < 0 )
-        {
-def WIN32
+ defined(WIN32) || defined(UNDER_CE)
-            msg_Err( p_this, "network select error (%i)", WSAGetLastError() );
-#else
@@ -206 +210 @@
-        if( ( i_ret = accept( fd, 0, 0 ) ) <= 0 )
-        {
-def WIN32
+ defined(WIN32) || defined(UNDER_CE)
-            msg_Err( p_this, "accept failed (%i)", WSAGetLastError() );
-#else
@@ -330 +334 @@
-
-        } while( (i_ret = select(fd + 1, &fds_r, NULL, &fds_e, &timeout)) == 0
+#ifdef HAVE_ERRNO_H
-                 || ( i_ret < 0 && errno == EINTR ) );
+#else
+                 );
+#endif
-
-        if( i_ret < 0 )
-        {
+#if defined(WIN32) || defined(UNDER_CE)
+            msg_Err( p_this, "network select error" );
+#else
-            msg_Err( p_this, "network select error (%s)", strerror(errno) );
+#endif
-            return i_total > 0 ? i_total : -1;
-        }
@@ -340 +352 @@
-        if( ( i_recv = recv( fd, p_data, i_data, 0 ) ) < 0 )
-        {
-def WIN32
+ defined(WIN32) || defined(UNDER_CE)
-            /* For udp only */
-            /* On win32 recv() will fail if the datagram doesn't fit inside
@@ -399 +411 @@
-    i_ret = select(fd + 1, &fds_r, NULL, &fds_e, &timeout);
-
+#ifdef HAVE_ERRNO_H
-    if( i_ret < 0 && errno == EINTR )
+#else
+    if( 0 )
+#endif
-    {
-        return 0;
@@ -405 +421 @@
-    else if( i_ret < 0 )
-    {
+#if defined(WIN32) || defined(UNDER_CE)
+        msg_Err( p_this, "network select error" );
+#else
-        msg_Err( p_this, "network select error (%s)", strerror(errno) );
+#endif
-        return -1;
-    }
@@ -414 +434 @@
-    else
-    {
-
+
+
+
-        if( ( i_recv = recv( fd, p_data, i_data, 0 ) ) <= 0 )
-        {
-def WIN32
+ defined(WIN32) || defined(UNDER_CE)
-            /* For udp only */
-            /* On win32 recv() will fail if the datagram doesn't fit inside
@@ -473 +495 @@
-
-        } while( (i_ret = select(fd + 1, NULL, &fds_w, &fds_e, &timeout)) == 0
+#ifdef HAVE_ERRNO_H
-                 || ( i_ret < 0 && errno == EINTR ) );
+#else
+                 );
+#endif
-
-        if( i_ret < 0 )
-        {
+#if defined(WIN32) || defined(UNDER_CE)
+            msg_Err( p_this, "network select error" );
+#else
-            msg_Err( p_this, "network select error (%s)", strerror(errno) );
+#endif
-            return i_total > 0 ? i_total : -1;
-        }

src/misc/vlm.c

@@ -1131 +1131 @@
-        schedule->b_enabled = VLC_FALSE;
-    }
+#if !defined( UNDER_CE )
-    else if( strcmp( psz_cmd, "date" ) == 0 )
-    {
@@ -1282 +1283 @@
-        schedule->i_period = ((mtime_t) date) * 1000000;
-    }
+#endif /* UNDER_CE */
-    else if( strcmp( psz_cmd, "repeat" ) == 0 )
-    {
@@ -1453 +1455 @@
-                                        "yes" : "no" ) );
-
+#if !defined( UNDER_CE )
-        if( schedule->i_date != 0 )
-        {
@@ -1506 +1509 @@
-            vlm_MessageAdd( msg_schedule, vlm_MessageNew("period", "0") );
-        }
+#endif /* UNDER_CE */
-
-        sprintf( buffer, "%d", schedule->i_repeat );
@@ -1618 +1622 @@
-                time_t i_date = (time_t) (i_next_date / 1000000) ;
-
+#if !defined( UNDER_CE )
-#ifdef HAVE_CTIME_R
-                char psz_date[500];
@@ -1627 +1632 @@
-                vlm_MessageAdd( msg_schedule,
-                                vlm_MessageNew( "next launch", psz_date ) );
+#endif
-            }
-        }
@@ -1893 +1899 @@
-
-    /* and now, the schedule scripts */
-
+
-    for( i = 0; i < vlm->i_schedule; i++ )
-    {
@@ -1963 +1969 @@
-
-    }
+#endif /* UNDER_CE */
-
-    return save;