Commit a0029715 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Moved S_ISREG define to setup as suggested by Dan.

parent 413cbdce

lib/config-win32.h

+0 −5
Original line number Diff line number Diff line
@@ -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

lib/setup.h

+5 −0
Original line number Diff line number Diff line
@@ -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.

 */

src/config-win32.h

+0 −5
Original line number Diff line number Diff line
@@ -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

src/setup.h

+5 −0
Original line number Diff line number Diff line
@@ -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.

 */