* Fixes for the Win32_msvc build

diff --git a/extras/libdvdcss/ioctl.c b/extras/libdvdcss/ioctl.c
index 687edf94a377c9159bef122556635060f9853213..f5dddc388ae153cd117ba98e06103d2af1d64587 100644 (file)
--- a/extras/libdvdcss/ioctl.c
+++ b/extras/libdvdcss/ioctl.c
@@ -2,7 +2,7 @@
  * ioctl.c: DVD ioctl replacement function
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ioctl.c,v 1.20 2002/01/13 18:13:07 gbazin Exp $
+ * $Id: ioctl.c,v 1.21 2002/04/01 21:54:26 gbazin Exp $
  *
  * Authors: Markus Kuespert <ltlBeBoy@beosmail.com>
  *          Samuel Hocevar <sam@zoy.org>
@@ -1462,7 +1462,9 @@ int ioctl_ReportRPC( int i_fd, int *p_type, int *p_mask, int *p_scheme )
         key->KeyType    = DvdGetRpcKey;
         key->KeyFlags   = 0;
 
-#warning "Fix ReportRPC for WIN32!"
+#if !defined( _MSC_VER )
+#    warning "Fix ReportRPC for WIN32!"
+#endif
         /* The IOCTL_DVD_READ_KEY might be the right IOCTL */
         i_ret = DeviceIoControl( (HANDLE) i_fd, IOCTL_DVD_READ_KEY, key, 
                 key->KeyLength, key, key->KeyLength, &tmp, NULL ) ? 0 : -1;

diff --git a/include/common.h b/include/common.h
index 2b53a94d1c9cdc0049d715044b6c1c91055d7747..7eecb0426b8062f74ff5426871f2ded3f9e28b80 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.89 2002/03/25 23:36:57 ipkiss Exp $
+ * $Id: common.h,v 1.90 2002/04/01 21:54:26 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -287,6 +287,10 @@ struct intf_subscription_s;
                     __r.__l[1] = __bswap_32 (__w.__l[0]);                     \
                   }                                                           \
                 __r.__ll; }))
+#   else
+#       define __bswap_64(i) \
+            (u64)((__bswap_32((i) & 0xffffffff) << 32) |                      \
+            __bswap_32(((i) >> 32) & 0xffffffff ))
 #   endif
 
 #else /* NTOHL_IN_SYS_PARAM_H || WIN32 */
@@ -394,11 +398,12 @@ struct intf_subscription_s;
 #       define __inline__      __inline
 #       define strncasecmp     strnicmp
 #       define strcasecmp      stricmp
+#       define S_IFBLK         0x3000  /* Block */
 #       define S_ISBLK(m)      (0)
 #       define S_ISCHR(m)      (0)
 #       define S_ISFIFO(m)     (((m)&_S_IFMT) == _S_IFIFO)
 #       define S_ISREG(m)      (((m)&_S_IFMT) == _S_IFREG)
-#       undef I64C(x)
+#       undef I64C
 #       define I64C(x)         x##i64
 #   endif
 
@@ -420,7 +425,6 @@ typedef __int64 off_t;
 #       else
 #           define off_t __int64
 #       endif
-#       define stat _stati64
 #   endif
 
 #   if defined( __BORLANDC__ )

diff --git a/src/misc/modules.c b/src/misc/modules.c
index db9c3d73d3e7848cc7b6d38b43c153d732c36af3..d6d2a306a2005253a92de95b2c23e4529408c088 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
  * modules.c : Built-in and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.56 2002/03/01 16:07:00 sam Exp $
+ * $Id: modules.c,v 1.57 2002/04/01 21:54:26 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -73,7 +73,12 @@
 #ifdef HAVE_DYNAMIC_PLUGINS
 #   include "modules_plugin.h"
 #endif
-#include "modules_builtin.h"
+
+#if !defined( _MSC_VER )
+#    include "modules_builtin.h"
+#else
+#    include "modules_builtin_msvc.h"
+#endif
 
 /*****************************************************************************
  * Local prototypes