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

mingw32 doesn't define _tsystem so provide one ourselves (bug 1726904) [backport from HEAD]

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-06-03 23:03:51 +00:00
parent fce88a4c47
commit 72115a3034
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/wxchar.h
View File

@@ -1218,10 +1218,22 @@ WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
WXDLLIMPEXP_BASE double wxAtof(const wxChar *psz); WXDLLIMPEXP_BASE double wxAtof(const wxChar *psz);
#endif #endif
/*
mingw32 doesn't provide _tsystem() even though it does provide all the other
stdlib.h functions wrappers so check for it separately:
*/
#if defined(__MINGW32__) && wxUSE_UNICODE && !defined(_tsystem)
#define wxNEED_WXSYSTEM
#endif
#ifdef wxNEED_WX_STDLIB_H #ifdef wxNEED_WX_STDLIB_H
WXDLLIMPEXP_BASE int wxAtoi(const wxChar *psz); WXDLLIMPEXP_BASE int wxAtoi(const wxChar *psz);
WXDLLIMPEXP_BASE long wxAtol(const wxChar *psz); WXDLLIMPEXP_BASE long wxAtol(const wxChar *psz);
WXDLLIMPEXP_BASE wxChar * wxGetenv(const wxChar *name); WXDLLIMPEXP_BASE wxChar * wxGetenv(const wxChar *name);
#define wxNEED_WXSYSTEM
#endif
#ifdef wxNEED_WXSYSTEM
WXDLLIMPEXP_BASE int wxSystem(const wxChar *psz); WXDLLIMPEXP_BASE int wxSystem(const wxChar *psz);
#endif #endif

5
src/common/wxchar.cpp
View File

@@ -2140,13 +2140,14 @@ wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
return getenv(name); return getenv(name);
#endif #endif
} }
#endif // wxNEED_WX_STDLIB_H
#ifdef wxNEED_WXSYSTEM
int WXDLLEXPORT wxSystem(const wxChar *psz) int WXDLLEXPORT wxSystem(const wxChar *psz)
{ {
return system(wxConvLibc.cWX2MB(psz)); return system(wxConvLibc.cWX2MB(psz));
} }
#endif // wxNEED_WXSYSTEM
#endif // wxNEED_WX_STDLIB_H
#ifdef wxNEED_WX_TIME_H #ifdef wxNEED_WX_TIME_H
WXDLLEXPORT size_t WXDLLEXPORT size_t