no changes, just resolved a conflict

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index a2ad505a0794c0ba79fd02b941056bca31e68df0..da237db11fb395fa1ce4fb049a79c26d6e776771 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -125,6 +125,9 @@
 #undef WINVER
 #endif
 
+/* OS/2 with EMX */
+#undef __OS2__
+
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
 #define wxUSE_NATIVE_STATUSBAR 1
@@ -870,6 +873,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
+/*
+ * Use gzip streams, requires wxUSE_ZLIB
+ */
+#define wxUSE_GZSTREAM 0
+
 /*
  * wxPalette class
  */