Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 #ifndef __LIBXML_WIN32_CONFIG__ | 1 #ifndef __LIBXML_WIN32_CONFIG__ |
| 2 #define __LIBXML_WIN32_CONFIG__ | 2 #define __LIBXML_WIN32_CONFIG__ |
| 3 | 3 |
| 4 #define HAVE_CTYPE_H | 4 #define HAVE_CTYPE_H |
| 5 #define HAVE_STDARG_H | 5 #define HAVE_STDARG_H |
| 6 #define HAVE_MALLOC_H | 6 #define HAVE_MALLOC_H |
| 7 #define HAVE_ERRNO_H | 7 #define HAVE_ERRNO_H |
| 8 #define SEND_ARG2_CAST | 8 #define HAVE_STDINT_H |
| 9 #define GETHOSTBYNAME_ARG_CAST | |
| 10 | 9 |
| 11 #if defined(_WIN32_WCE) | 10 #if defined(_WIN32_WCE) |
| 12 #undef HAVE_ERRNO_H | 11 #undef HAVE_ERRNO_H |
| 13 #include <windows.h> | 12 #include <windows.h> |
| 14 #include "wincecompat.h" | 13 #include "wincecompat.h" |
| 15 #else | 14 #else |
| 16 #define HAVE_SYS_STAT_H | 15 #define HAVE_SYS_STAT_H |
| 17 #define HAVE__STAT | 16 #define HAVE__STAT |
| 18 #define HAVE_STAT | 17 #define HAVE_STAT |
| 19 #define HAVE_STDLIB_H | 18 #define HAVE_STDLIB_H |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 90 } | 89 } |
| 91 } else { | 90 } else { |
| 92 return 0; | 91 return 0; |
| 93 } | 92 } |
| 94 } | 93 } |
| 95 #endif | 94 #endif |
| 96 #endif /* _MSC_VER */ | 95 #endif /* _MSC_VER */ |
| 97 | 96 |
| 98 #if defined(_MSC_VER) | 97 #if defined(_MSC_VER) |
| 99 #define mkdir(p,m) _mkdir(p) | 98 #define mkdir(p,m) _mkdir(p) |
| 100 #if _MSC_VER < 1900 | |
| 101 #define snprintf _snprintf | 99 #define snprintf _snprintf |
| 102 #endif | |
|
Peter Kasting
2016/03/03 22:32:53
Removing these two lines is what broke the Visual
| |
| 103 #if _MSC_VER < 1500 | 100 #if _MSC_VER < 1500 |
| 104 #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) | 101 #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) |
| 105 #endif | 102 #endif |
| 106 #elif defined(__MINGW32__) | 103 #elif defined(__MINGW32__) |
| 107 #define mkdir(p,m) _mkdir(p) | 104 #define mkdir(p,m) _mkdir(p) |
| 108 #endif | 105 #endif |
| 109 | 106 |
| 110 /* Threading API to use should be specified here for compatibility reasons. | 107 /* Threading API to use should be specified here for compatibility reasons. |
| 111 This is however best specified on the compiler's command-line. */ | 108 This is however best specified on the compiler's command-line. */ |
| 112 #if defined(LIBXML_THREAD_ENABLED) | 109 #if defined(LIBXML_THREAD_ENABLED) |
| 113 #if !defined(HAVE_PTHREAD_H) && !defined(HAVE_WIN32_THREADS) && !defined(_WIN32_ WCE) | 110 #if !defined(HAVE_PTHREAD_H) && !defined(HAVE_WIN32_THREADS) && !defined(_WIN32_ WCE) |
| 114 #define HAVE_WIN32_THREADS | 111 #define HAVE_WIN32_THREADS |
| 115 #endif | 112 #endif |
| 116 #endif | 113 #endif |
| 117 | 114 |
| 118 /* Some third-party libraries far from our control assume the following | 115 /* Some third-party libraries far from our control assume the following |
| 119 is defined, which it is not if we don't include windows.h. */ | 116 is defined, which it is not if we don't include windows.h. */ |
| 120 #if !defined(FALSE) | 117 #if !defined(FALSE) |
| 121 #define FALSE 0 | 118 #define FALSE 0 |
| 122 #endif | 119 #endif |
| 123 #if !defined(TRUE) | 120 #if !defined(TRUE) |
| 124 #define TRUE (!(FALSE)) | 121 #define TRUE (!(FALSE)) |
| 125 #endif | 122 #endif |
| 126 | 123 |
| 127 #endif /* __LIBXML_WIN32_CONFIG__ */ | 124 #endif /* __LIBXML_WIN32_CONFIG__ */ |
| 128 | 125 |
| OLD | NEW |