avoiding double define warnings on osx

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/expat/lib/macconfig.h b/src/expat/lib/macconfig.h
index 3c5eb541a12eb4abfaa105bc44e3e5ba7080c5c9..b3eb338a3d81d3b737cdaf567d5563592379af12 100644 (file)
--- a/src/expat/lib/macconfig.h
+++ b/src/expat/lib/macconfig.h
@@ -43,13 +43,17 @@
 #undef HAVE_STDINT_H
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDINT_H
 
 /* Define to 1 if you have the <stdlib.h> header file. */

+#ifndef HAVE_STDLIB_H

 #define HAVE_STDLIB_H
 #define HAVE_STDLIB_H

+#endif

 
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */
 
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */

+#ifndef HAVE_STRING_H

 #define HAVE_STRING_H
 #define HAVE_STRING_H

+#endif

 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H


@@ -76,7 +80,9 @@
 #undef PACKAGE_VERSION
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef PACKAGE_VERSION
 
 /* Define to 1 if you have the ANSI C header files. */

+#ifndef STDC_HEADERS

 #define STDC_HEADERS
 #define STDC_HEADERS

+#endif

 
 /* whether byteorder is bigendian */
 #define WORDS_BIGENDIAN
 
 /* whether byteorder is bigendian */
 #define WORDS_BIGENDIAN