colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix C vs C++ locale handling on AIX+gcc; tweak mini-setup script

This commit is contained in:
Brian Cox 2019-09-20 16:07:20 -07:00
parent e4a1a1666d
commit 0467ede8d9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mini-setup.sh
View File

@ -6,7 +6,7 @@
cp src/mini-setup/twcfg.txt bin/twcfg.txt cp src/mini-setup/twcfg.txt bin/twcfg.txt
cp src/mini-setup/twpol.txt bin/twpol.txt cp src/mini-setup/twpol.txt bin/twpol.txt
chdir bin cd bin
if [ ! -f "l" ] || [ ! -f "s" ]; then if [ ! -f "l" ] || [ ! -f "s" ]; then
echo "***** Generating Keys *****" echo "***** Generating Keys *****"

5
src/core/platform.h
View File

@ -200,6 +200,9 @@
# elif defined(_AIX) # elif defined(_AIX)
# define OS OS_AIX # define OS OS_AIX
# define IS_AIX 1 # define IS_AIX 1
# if defined(__PASE__)
# define IS_PASE 1
# endif
# elif defined(__hpux) # elif defined(__hpux)
# define OS OS_HPUX # define OS OS_HPUX
@ -351,7 +354,7 @@
# define USE_STD_CPP_LOCALE_WORKAROUND \ # define USE_STD_CPP_LOCALE_WORKAROUND \
(IS_SUNPRO || (IS_KAI && !IS_KAI_3_4)) // TODO:BAM -- name this something more general. (IS_SUNPRO || (IS_KAI && !IS_KAI_3_4)) // TODO:BAM -- name this something more general.
//# define USE_CLIB_LOCALE IS_KAI || HAVE_GCC //# define USE_CLIB_LOCALE IS_KAI || HAVE_GCC
# define USE_CLIB_LOCALE (!HAVE_LOCALE || (HAVE_GCC && IS_SOLARIS)) # define USE_CLIB_LOCALE (!HAVE_LOCALE || (HAVE_GCC && (IS_SOLARIS || IS_AIX)))
# define USES_CLIB_DATE_FUNCTION \ # define USES_CLIB_DATE_FUNCTION \
(USE_CLIB_LOCALE || IS_SUNPRO || \ (USE_CLIB_LOCALE || IS_SUNPRO || \
IS_MSVC) // if we use clib, can't use C++ time_put, and SUNPRO and MSVC add characters IS_MSVC) // if we use clib, can't use C++ time_put, and SUNPRO and MSVC add characters