diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/zip/lib/php_zip_config.w32.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/zip/lib/php_zip_config.w32.h')
| -rw-r--r-- | ext/zip/lib/php_zip_config.w32.h | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/ext/zip/lib/php_zip_config.w32.h b/ext/zip/lib/php_zip_config.w32.h index 1fec26317b..b3192cbdd4 100644 --- a/ext/zip/lib/php_zip_config.w32.h +++ b/ext/zip/lib/php_zip_config.w32.h @@ -1,60 +1,60 @@ -#ifndef HAD_CONFIG_H
-#define HAD_CONFIG_H
-#define HAVE__CLOSE
-#define HAVE__DUP
-#define HAVE__FDOPEN
-#define HAVE__FILENO
-#define HAVE__OPEN
-#define HAVE__SNPRINTF
-/* #undef HAVE__STRCMPI */
-#define HAVE__STRDUP
-#define HAVE__STRICMP
-/* #undef HAVE_FSEEKO */
-/* #undef HAVE_FTELLO */
-/* #undef HAVE_MKSTEMP */
-#define HAVE_MOVEFILEEXA
-/* #undef HAVE_SNPRINTF */
-/* #undef HAVE_STRCASECMP */
-/* #undef HAVE_STRINGS_H */
-/* #undef HAVE_STRUCT_TM_TM_ZONE */
-/* #undef HAVE_UNISTD_H */
-#define PACKAGE "libzip"
-#define VERSION "0.10.b"
-
-/* #undef HAVE_SSIZE_T */
-
-#ifndef HAVE_SSIZE_T
-
-#ifndef SIZE_T_LIBZIP
-#define SIZE_T_LIBZIP 4
-#endif
-#ifndef INT_LIBZIP
-#define INT_LIBZIP 4
-#endif
-#ifndef LONG_LIBZIP
-#define LONG_LIBZIP 4
-#endif
-#ifndef LONG_LONG_LIBZIP
-#define LONG_LONG_LIBZIP 8
-#endif
-#ifndef SIZEOF_OFF_T
-#define SIZEOF_OFF_T 4
-#endif
-
-# if SIZE_T_LIBZIP == INT_LIBZIP
-# ifndef ssize_t
-typedef int ssize_t;
-# endif
-# elif SIZE_T_LIBZIP == LONG_LIBZIP
-typedef long ssize_t;
-# elif SIZE_T_LIBZIP == LONG_LONG_LIBZIP
-typedef long long ssize_t;
-# else
-#error no suitable type for ssize_t found
-# endif
-#endif
-
-# undef strcasecmp
-# define strcasecmp _strcmpi
-
-#endif /* HAD_CONFIG_H */
+#ifndef HAD_CONFIG_H +#define HAD_CONFIG_H +#define HAVE__CLOSE +#define HAVE__DUP +#define HAVE__FDOPEN +#define HAVE__FILENO +#define HAVE__OPEN +#define HAVE__SNPRINTF +/* #undef HAVE__STRCMPI */ +#define HAVE__STRDUP +#define HAVE__STRICMP +/* #undef HAVE_FSEEKO */ +/* #undef HAVE_FTELLO */ +/* #undef HAVE_MKSTEMP */ +#define HAVE_MOVEFILEEXA +/* #undef HAVE_SNPRINTF */ +/* #undef HAVE_STRCASECMP */ +/* #undef HAVE_STRINGS_H */ +/* #undef HAVE_STRUCT_TM_TM_ZONE */ +/* #undef HAVE_UNISTD_H */ +#define PACKAGE "libzip" +#define VERSION "0.10.b" + +/* #undef HAVE_SSIZE_T */ + +#ifndef HAVE_SSIZE_T + +#ifndef SIZE_T_LIBZIP +#define SIZE_T_LIBZIP 4 +#endif +#ifndef INT_LIBZIP +#define INT_LIBZIP 4 +#endif +#ifndef LONG_LIBZIP +#define LONG_LIBZIP 4 +#endif +#ifndef LONG_LONG_LIBZIP +#define LONG_LONG_LIBZIP 8 +#endif +#ifndef SIZEOF_OFF_T +#define SIZEOF_OFF_T 4 +#endif + +# if SIZE_T_LIBZIP == INT_LIBZIP +# ifndef ssize_t +typedef int ssize_t; +# endif +# elif SIZE_T_LIBZIP == LONG_LIBZIP +typedef long ssize_t; +# elif SIZE_T_LIBZIP == LONG_LONG_LIBZIP +typedef long long ssize_t; +# else +#error no suitable type for ssize_t found +# endif +#endif + +# undef strcasecmp +# define strcasecmp _strcmpi + +#endif /* HAD_CONFIG_H */ |