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

Applied patch [ 1381895 ] remove circular include dependendcy in wxchar.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-01-18 12:46:11 +00:00
parent 77bf709fe7
commit ac6178d747
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/wxchar.h
View File

@@ -14,7 +14,9 @@
#ifndef _WX_WXCHAR_H_ #ifndef _WX_WXCHAR_H_
#define _WX_WXCHAR_H_ #define _WX_WXCHAR_H_
#include "wx/defs.h" /* for wxUSE_UNICODE */ /* defs.h indirectly includes this file, so don't include it here */
#include "wx/platform.h"
#include "wx/dlimpexp.h"
#if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS #if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
char *strtok_r(char *, const char *, char **); char *strtok_r(char *, const char *, char **);
@@ -48,7 +50,7 @@
/* /*
Standard headers we need here. Standard headers we need here.
NB: don't include any wxWidgets headers here because almost of them include NB: don't include any wxWidgets headers here because almost all of them include
this one! this one!
*/ */

1
src/regex/regcustom.h
View File

@@ -36,6 +36,7 @@
#include <string.h> #include <string.h>
/* must include this after ctype.h inclusion for CodeWarrior/Mac */ /* must include this after ctype.h inclusion for CodeWarrior/Mac */
#include "wx/defs.h"
#include "wx/wxchar.h" #include "wx/wxchar.h"
/* /*