Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various cygwin compilation fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2001-10-24 20:56:37 +00:00
parent f676c7ffd5
commit 0e44823110
5 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/defs.h
View File

@@ -130,6 +130,12 @@
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#endif // __WXMAC__ && __DARWIN__ #endif // __WXMAC__ && __DARWIN__
#if defined(__CYGWIN__)
#if !defined(wxSIZE_T_IS_UINT)
#define wxSIZE_T_IS_UINT
#endif
#endif
#elif defined(applec) || \ #elif defined(applec) || \
defined(THINK_C) || \ defined(THINK_C) || \
(defined(__MWERKS__) && !defined(__INTEL__)) (defined(__MWERKS__) && !defined(__INTEL__))

3
include/wx/wxchar.h
View File

@@ -68,6 +68,9 @@
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#elif defined(__CYGWIN__)
#include <stddef.h>
#include <wchar.h>
#endif #endif
#elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400) #elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
// VisualAge 4.0+ supports TCHAR // VisualAge 4.0+ supports TCHAR

2
setup.h.in
View File

@@ -94,7 +94,9 @@
#endif #endif
#undef __WIN95__ #undef __WIN95__
#ifndef __WIN32__
#undef __WIN32__ #undef __WIN32__
#endif
#undef __GNUWIN32__ #undef __GNUWIN32__
#undef STRICT #undef STRICT
#undef WINVER #undef WINVER

6
src/common/mimecmn.cpp
View File

@@ -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); return m_impl->Unassociate(ft);
#else #else
return ft->Unassociate(); return ft->Unassociate();
@@ -584,7 +584,7 @@ size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes)
void wxMimeTypesManager::Initialize(int mcapStyle, void wxMimeTypesManager::Initialize(int mcapStyle,
const wxString& sExtraDir) const wxString& sExtraDir)
{ {
#if defined(__UNIX__) && !defined(__WXPM__) #if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)
EnsureImpl(); EnsureImpl();
m_impl->Initialize(mcapStyle, sExtraDir); m_impl->Initialize(mcapStyle, sExtraDir);
@@ -597,7 +597,7 @@ void wxMimeTypesManager::Initialize(int mcapStyle,
// and this function clears all the data from the manager // and this function clears all the data from the manager
void wxMimeTypesManager::ClearData() void wxMimeTypesManager::ClearData()
{ {
#if defined(__UNIX__) && !defined(__WXPM__) #if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)
EnsureImpl(); EnsureImpl();
m_impl->ClearData(); m_impl->ClearData();

4
src/regex/makefile.g95
View File

@@ -1,4 +1,8 @@
ifeq ($(WXWIN),)
WXWIN=../..
endif
LIBTARGET=$(WXWIN)/lib/libregex.a LIBTARGET=$(WXWIN)/lib/libregex.a
OBJECTS= \ OBJECTS= \