Moved S_ISREG define to setup as suggested by Dan.

diff --git a/lib/config-win32.h b/lib/config-win32.h
index 24cb6e0ddb9e78b8289fffaa944a72a24f204e7c..5ee76065d87da188df5c9deb43a9426bbbef2c7b 100644 (file)
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -391,11 +391,6 @@
 /* Windows should not have HAVE_GMTIME_R defined */
 /* #undef HAVE_GMTIME_R */
 
-/* Define S_ISREG if not defined by system headers */
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
-
 /* Define if the compiler supports C99 variadic macro style. */
 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
 #define HAVE_VARIADIC_MACROS_C99 1

diff --git a/lib/setup.h b/lib/setup.h
index e7dcba1dc5610ad78439ef77b7defcac9a0c2651..cc016c9cd37457b9dc2a1be823f4103a79823e3c 100644 (file)
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -552,6 +552,11 @@ int netware_init(void);
 #define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE")
 #endif
 
+/* Define S_ISREG if not defined by system headers, f.e. MSVC */
+#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
+#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+#endif
+
 /*
  * Include macros and defines that should only be processed once.
  */

diff --git a/src/config-win32.h b/src/config-win32.h
index 0104edb808081983470a1ad19117529bb2745f5a..10a5eaf175243a6c69e1b69ff580880c20fd44dc 100644 (file)
--- a/src/config-win32.h
+++ b/src/config-win32.h
@@ -272,11 +272,6 @@
 /* Windows should not have HAVE_GMTIME_R defined */
 /* #undef HAVE_GMTIME_R */
 
-/* Define S_ISREG if not defined by system headers */                                                                               
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
-
 /* Define if the compiler supports C99 variadic macro style. */
 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
 #define HAVE_VARIADIC_MACROS_C99 1

diff --git a/src/setup.h b/src/setup.h
index 69da71024937032c75656a69fa0251b903c27aa2..0d2a99fb4abfcb84816e5326aa16c55debbc9015 100644 (file)
--- a/src/setup.h
+++ b/src/setup.h
@@ -207,6 +207,11 @@ int fileno( FILE *stream);
 #define strdup(ptr) curlx_strdup(ptr)
 #endif
 
+/* Define S_ISREG if not defined by system headers, f.e. MSVC */
+#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
+#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+#endif
+
 /*
  * Include macros and defines that should only be processed once.
  */