From: Guenter Knauf <lists@gknw.net>
Date: Thu, 2 Sep 2010 02:37:13 +0000 (+0200)
Subject: Moved S_ISREG define to setup as suggested by Dan.
X-Git-Tag: curl-7_21_2~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a00297158e881447deed870e4a8b9989893f15b2;p=thirdparty%2Fcurl.git

Moved S_ISREG define to setup as suggested by Dan.
---

diff --git a/lib/config-win32.h b/lib/config-win32.h
index 24cb6e0ddb..5ee76065d8 100644
--- 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 e7dcba1dc5..cc016c9cd3 100644
--- 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 0104edb808..10a5eaf175 100644
--- 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 69da710249..0d2a99fb4a 100644
--- 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.
  */