[ros-diffs] [cwittich] 32566: don't include unistd.h in msvc builds add some x64 declarations from wine to port.h

[cwittich at svn.reactos.org]

Author: cwittich
Date: Wed Mar  5 09:06:17 2008
New Revision: 32566

URL: http://svn.reactos.org/svn/reactos?rev=3D32566&view=3Drev
Log:
don't include unistd.h in msvc builds
add some x64 declarations from wine to port.h

Modified:
    trunk/reactos/include/reactos/wine/config.h
    trunk/reactos/include/reactos/wine/port.h

Modified: trunk/reactos/include/reactos/wine/config.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/=
config.h?rev=3D32566&r1=3D32565&r2=3D32566&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/include/reactos/wine/config.h (original)
+++ trunk/reactos/include/reactos/wine/config.h Wed Mar  5 09:06:17 2008
@@ -780,7 +780,9 @@
 /* #undef HAVE_UNICODE_UBIDI_H */
 =

 /* Define to 1 if you have the <unistd.h> header file. */
+#if !defined(_MSC_VER)
 #define HAVE_UNISTD_H 1
+#endif
 =

 /* Define to 1 if you have the `usleep' function. */
 /* #undef HAVE_USLEEP */

Modified: trunk/reactos/include/reactos/wine/port.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/=
port.h?rev=3D32566&r1=3D32565&r2=3D32566&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/include/reactos/wine/port.h (original)
+++ trunk/reactos/include/reactos/wine/port.h Wed Mar  5 09:06:17 2008
@@ -48,6 +48,14 @@
 /****************************************************************
  * Type definitions
  */
+
+#if !defined(_MSC_VER) && !defined(__int64)
+#  if defined(__x86_64__) || defined(_WIN64)
+#    define __int64 long
+#  else
+#    define __int64 long long
+#  endif
+#endif
 =

 #ifndef HAVE_MODE_T
 typedef int mode_t;