VC6->VC7 port (VC7 already defined BYTE, SHORT, LONG + I don't know why but...

VC6->VC7 port (VC7 already defined BYTE, SHORT, LONG + I don't know why but QUAD structure does not compile using a LONG on VC7 - but compiled with 'int'...)

mediachanger/castorrmc/h/osdep.h

 /*
- * $Id: osdep.h,v 1.18 2005/07/11 11:03:00 jdurand Exp $
+ * $Id: osdep.h,v 1.19 2005/10/21 09:31:12 jdurand Exp $
  */
 
 /*
@@ -8,7 +8,7 @@
  */
 
 /*
- * @(#)$RCSfile: osdep.h,v $ $Revision: 1.18 $ $Date: 2005/07/11 11:03:00 $ CERN IT-PDP/IP Frederic Hemmer
+ * @(#)$RCSfile: osdep.h,v $ $Revision: 1.19 $ $Date: 2005/10/21 09:31:12 $ CERN IT-PDP/IP Frederic Hemmer
  */
 
 /* osdep.h      Operating system dependencies                           */
@@ -36,15 +36,26 @@ typedef struct  {
         U_LONG      mslw;
 } U_QUAD;
 #ifndef _WINDEF_
+/*
+  VC 5.0 : 1100
+  VC 6.0 : 1200
+  VC 7.0 : 1300 (.NET)
+*/
+
+#if _MSC_VER < 1300
 typedef          char   BYTE;
 typedef          short  WORD;
 typedef          int    LONG;
 #endif
+#endif
 typedef struct  {
-        U_LONG    lslw;
+#if _MSC_VER < 1300
         LONG      mslw;
+#else
+        int      mslw;
+#endif
+        U_LONG    lslw;
 } QUAD;
- 
 #define BYTEADDR(x)     (((char *)&(x))+sizeof(BYTE)-BYTESIZE)
 #define WORDADDR(x)     (((char *)&(x))+sizeof(WORD)-WORDSIZE)
 #define LONGADDR(x)     (((char *)&(x))+sizeof(LONG)-LONGSIZE)