Various cygwin compilation fixes.

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 064b94ce47558ee42a7c596093d1b9d08b111fca..8a70d08344c0ea6ee9151c3941f6e85d728114eb 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -130,6 +130,12 @@
 
         #include <Carbon/Carbon.h>
     #endif // __WXMAC__ && __DARWIN__
 
         #include <Carbon/Carbon.h>
     #endif // __WXMAC__ && __DARWIN__

+
+    #if defined(__CYGWIN__)
+        #if !defined(wxSIZE_T_IS_UINT)
+            #define wxSIZE_T_IS_UINT
+        #endif
+    #endif

 #elif defined(applec) || \
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
 #elif defined(applec) || \
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index c185288ce6be8a45894ca5153a82b6c98a1c2e53..5ac03f6416c5983a2d0548dd2a450b29f7dc79ac 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -68,6 +68,9 @@
         #include <stddef.h>
         #include <string.h>
         #include <ctype.h>
         #include <stddef.h>
         #include <string.h>
         #include <ctype.h>

+    #elif defined(__CYGWIN__)
+        #include <stddef.h>
+        #include <wchar.h>

     #endif
 #elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
     // VisualAge 4.0+ supports TCHAR
     #endif
 #elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
     // VisualAge 4.0+ supports TCHAR

diff --git a/setup.h.in b/setup.h.in
index f6e91fec797ca7815abccdd25da4f426c5c0127c..5ad250d7a2277406c6793894d2ac69190213b13c 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -94,7 +94,9 @@
 #endif
 
 #undef __WIN95__
 #endif
 
 #undef __WIN95__

+#ifndef __WIN32__

 #undef __WIN32__
 #undef __WIN32__

+#endif

 #undef __GNUWIN32__
 #undef STRICT
 #undef WINVER
 #undef __GNUWIN32__
 #undef STRICT
 #undef WINVER

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 8a16ced893591f3c2bd0bfedbf94587588b1b72f..6ee6a7a7fa08d1717e60f47798d342664c5f61ae 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -474,7 +474,7 @@ wxMimeTypesManager::~wxMimeTypesManager()
 
 bool wxMimeTypesManager::Unassociate(wxFileType *ft)
 {
 
 bool wxMimeTypesManager::Unassociate(wxFileType *ft)
 {

-#if defined(__UNIX__) && !defined(__WXPM__)
+#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)

     return m_impl->Unassociate(ft);
 #else
     return ft->Unassociate();
     return m_impl->Unassociate(ft);
 #else
     return ft->Unassociate();


@@ -584,7 +584,7 @@ size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes)
 void wxMimeTypesManager::Initialize(int mcapStyle,
                                     const wxString& sExtraDir)
 {
 void wxMimeTypesManager::Initialize(int mcapStyle,
                                     const wxString& sExtraDir)
 {

-#if defined(__UNIX__) && !defined(__WXPM__)
+#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)

     EnsureImpl();
 
     m_impl->Initialize(mcapStyle, sExtraDir);
     EnsureImpl();
 
     m_impl->Initialize(mcapStyle, sExtraDir);


@@ -597,7 +597,7 @@ void wxMimeTypesManager::Initialize(int mcapStyle,
 // and this function clears all the data from the manager
 void wxMimeTypesManager::ClearData()
 {
 // and this function clears all the data from the manager
 void wxMimeTypesManager::ClearData()
 {

-#if defined(__UNIX__) && !defined(__WXPM__)
+#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)

     EnsureImpl();
 
     m_impl->ClearData();
     EnsureImpl();
 
     m_impl->ClearData();

diff --git a/src/regex/makefile.g95 b/src/regex/makefile.g95
index 9043156a1d913d2e5762b3616068e0c773969597..06c95c8f9c0135cdfbc774be579fe852f82359ec 100644 (file)
--- a/src/regex/makefile.g95
+++ b/src/regex/makefile.g95
@@ -1,4 +1,8 @@
 
 

+ifeq ($(WXWIN),)
+WXWIN=../..
+endif
+

 LIBTARGET=$(WXWIN)/lib/libregex.a
 
 OBJECTS= \
 LIBTARGET=$(WXWIN)/lib/libregex.a
 
 OBJECTS= \