Added missing wx/defs.h includes in propgrid headers

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 0a76ab191fd3320364b222a9812f3d1d1dcb2493..26acd387f09f60b36c4024928e04471246cd2403 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -193,6 +193,12 @@
 #define va_list __gnuc_va_list
 #endif /*  HP-UX */
 
+/* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */
+/* when using Windows sockets. */
+#ifdef __CYGWIN__
+#define __USE_W32_SOCKETS
+#endif
+
 /*  ---------------------------------------------------------------------------- */
 /*  check for native bool type and TRUE/FALSE constants */
 /*  ---------------------------------------------------------------------------- */
@@ -929,10 +935,6 @@ typedef wxUint16 wxWord;
     #error "SIZEOF_WCHAR_T must be defined, but isn't"
 #endif
 
-#if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
-    #error "wxSIZE_T_IS_UINT or wxSIZE_T_IS_ULONG must be defined"
-#endif
-
 /* also define C99-like sized MIN/MAX constants */
 #define wxINT8_MIN CHAR_MIN
 #define wxINT8_MAX CHAR_MAX