diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
| commit | 051d521f6e20761ba6831cecd91883da960fa931 (patch) | |
| tree | b28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/XlcPubI.h | |
| parent | 6dce607bad8711dd06a5a7b69ad1930386b4123b (diff) | |
| parent | b8de7bf654929c823080b211aeac56cd213f5a32 (diff) | |
| download | nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2 nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip | |
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/XlcPubI.h')
| -rw-r--r-- | nx-X11/lib/X11/XlcPubI.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/nx-X11/lib/X11/XlcPubI.h b/nx-X11/lib/X11/XlcPubI.h index 48a1dea20..f41e3442a 100644 --- a/nx-X11/lib/X11/XlcPubI.h +++ b/nx-X11/lib/X11/XlcPubI.h @@ -96,7 +96,7 @@ typedef struct _XLCdPublicPart { } XLCdPublicPart; typedef struct _XLCdPublicRec { - XLCdCoreRec core; + XLCdCoreRec core; XLCdPublicPart pub; } XLCdPublicRec, *XLCdPublic; @@ -204,6 +204,12 @@ extern int _XlcResolveI18NPath( int buf_len ); +extern char *_XlcLocaleLibDirName( + char* /* dir_name */, + size_t, /* dir_len */ + char* /* lc_name */ +); + extern char *_XlcLocaleDirName( char* /* dir_name */, size_t, /* dir_len */ @@ -232,7 +238,7 @@ _Xsetlocale( int category, _Xconst char *name); #else -#ifdef __DARWIN__ +#if defined(__APPLE__) || defined(__DARWIN__) extern char * _Xsetlocale( int category, |