diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-11 14:49:13 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-11 14:49:13 -0800 |
| commit | c3f3eb1284c59305568288923810dc155df6025c (patch) | |
| tree | 216acf54672b7f97a80d72ca63166859a99ff7f9 | |
| parent | b35344c9a74b478509e33384cc99bcc4fd092a2d (diff) | |
unifdef AIXV3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | src/SetLocale.c | 19 | ||||
| -rw-r--r-- | src/XlibInt.c | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/SetLocale.c b/src/SetLocale.c index 66a7d2a0..20c56d62 100644 --- a/src/SetLocale.c +++ b/src/SetLocale.c @@ -99,7 +99,7 @@ _XlcMapOSLocaleName( char *osname, char *siname) { -#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(__UNIXOS2__) || defined(linux) +#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(ultrix) || defined(WIN32) || defined(__UNIXOS2__) || defined(linux) # ifdef hpux # ifndef _LastCategory /* HPUX 9 and earlier */ @@ -122,18 +122,13 @@ _XlcMapOSLocaleName( # define ENDCHAR ';' # define WHITEFILL # else -# if (defined(AIXV3) && !defined(AIXV4)) -# define STARTCHAR ' ' -# define ENDCHAR ' ' +# if defined(linux) +# define STARTSTR "LC_CTYPE=" +# define ENDCHAR ';' # else -# if defined(linux) -# define STARTSTR "LC_CTYPE=" -# define ENDCHAR ';' -# else -# if !defined(sun) || defined(SVR4) -# define STARTCHAR '/' -# define ENDCHAR '/' -# endif +# if !defined(sun) || defined(SVR4) +# define STARTCHAR '/' +# define ENDCHAR '/' # endif # endif # endif diff --git a/src/XlibInt.c b/src/XlibInt.c index 297b7711..b303b652 100644 --- a/src/XlibInt.c +++ b/src/XlibInt.c @@ -1706,7 +1706,7 @@ _XData32( * and so, you may be better off using gethostname (if it exists). */ -#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(SVR4) +#if (defined(_POSIX_SOURCE) && !defined(__QNX__)) || defined(hpux) || defined(SVR4) #define NEED_UTSNAME #include <sys/utsname.h> #else |