Author: amunger
Date: Tue Aug 1 02:34:55 2006
New Revision: 23396
URL:
http://svn.reactos.org/svn/reactos?rev=23396&view=rev
Log:
Fix the build on linux (for real). Patch from hpoussin, who checked that it didn't
break the win32 build.
This also reverts 23394.
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/confi…
==============================================================================
--- trunk/reactos/include/reactos/wine/config.h (original)
+++ trunk/reactos/include/reactos/wine/config.h Tue Aug 1 02:34:55 2006
@@ -574,7 +574,9 @@
#define HAVE_STDLIB_H 1
/* Define to 1 if you have the `strcasecmp' function. */
-//#define HAVE_STRCASECMP 1
+#if !defined(_WIN32) && !defined(_WIN64)
+#define HAVE_STRCASECMP 1
+#endif
/* Define to 1 if you have the `strerror' function. */
#define HAVE_STRERROR 1
@@ -586,7 +588,9 @@
#define HAVE_STRING_H 1
/* Define to 1 if you have the `strncasecmp' function. */
-//#define HAVE_STRNCASECMP 1
+#if !defined(_WIN32) && !defined(_WIN64)
+#define HAVE_STRNCASECMP 1
+#endif
/* Define to 1 if `direction' is member of `struct ff_effect'. */
/* #undef HAVE_STRUCT_FF_EFFECT_DIRECTION */
@@ -853,10 +857,14 @@
#define HAVE__SPAWNVP 1
/* Define to 1 if you have the `_stricmp' function. */
-//#define HAVE__STRICMP 1
+#if defined(_WIN32) || defined(_WIN64)
+#define HAVE__STRICMP 1
+#endif
/* Define to 1 if you have the `_strnicmp' function. */
+#if defined(_WIN32) || defined(_WIN64)
#define HAVE__STRNICMP 1
+#endif
/* Define to 1 if you have the `_vsnprintf' function. */
#define HAVE__VSNPRINTF 1
Modified: trunk/reactos/include/reactos/wine/port.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.…
==============================================================================
--- trunk/reactos/include/reactos/wine/port.h (original)
+++ trunk/reactos/include/reactos/wine/port.h Tue Aug 1 02:34:55 2006
@@ -272,10 +272,6 @@
# else
# define strncasecmp _strnicmp
# endif
-#else
-# ifndef HAVE__STRNICMP
-# define _strnicmp strncasecmp
-# endif
#endif /* !defined(HAVE_STRNCASECMP) */
#ifndef HAVE_STRERROR