diff options
| -rw-r--r-- | os400/initscript.sh | 4 | ||||
| -rw-r--r-- | os400/libxmlrpg/xmlstring.rpgle | 4 | ||||
| -rw-r--r-- | os400/make-src.sh | 2 | ||||
| -rwxr-xr-x | python/setup.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/os400/initscript.sh b/os400/initscript.sh index cc52e45e..42ce54d5 100644 --- a/os400/initscript.sh +++ b/os400/initscript.sh @@ -50,7 +50,7 @@ setenv TGTCCSID '500' # Target CCSID of objects. setenv DEBUG '*ALL' # Debug level. setenv OPTIMIZE '10' # Optimisation level. setenv OUTPUT '*NONE' # Compilation output option. -setenv TGTRLS 'V5R3M0' # Target OS release. +setenv TGTRLS 'V6R1M0' # Target OS release. setenv IFSDIR '/libxml2' # Installation IFS directory. @@ -217,7 +217,7 @@ make_module() cat "${2}" >> __tmpsrcf.c CMD="CRTCMOD MODULE(${TARGETLIB}/${1}) SRCSTMF('__tmpsrcf.c')" # CMD="${CMD} OPTION(*INCDIRFIRST *SHOWINC *SHOWSYS)" - CMD="${CMD} OPTION(*INCDIRFIRST)" + CMD="${CMD} OPTION(*INCDIRFIRST) FLAG(10)" CMD="${CMD} SYSIFCOPT(*IFS64IO) LANGLVL(*EXTENDED) LOCALETYPE(*LOCALE)" CMD="${CMD} INCDIR(" if [ -z "${SYSICONV}" ] diff --git a/os400/libxmlrpg/xmlstring.rpgle b/os400/libxmlrpg/xmlstring.rpgle index 8980fc04..59a7625c 100644 --- a/os400/libxmlrpg/xmlstring.rpgle +++ b/os400/libxmlrpg/xmlstring.rpgle @@ -115,7 +115,7 @@ d like(xmlCint) d buf * value options(*string) xmlChar * d len value like(xmlCint) - d msg * value options(*string) const xmlChar * + d msg * value options(*string) const char * d arg1 * value options(*string: *nopass) d arg2 * value options(*string: *nopass) d arg3 * value options(*string: *nopass) @@ -129,7 +129,7 @@ d like(xmlCint) d buf * value options(*string) xmlChar * d len value like(xmlCint) - d msg * value options(*string) const xmlChar * + d msg * value options(*string) const char * d ap likeds(xmlVaList) d xmlGetUTF8Char pr extproc('xmlGetUTF8Char') diff --git a/os400/make-src.sh b/os400/make-src.sh index 6094de8e..4c03c565 100644 --- a/os400/make-src.sh +++ b/os400/make-src.sh @@ -17,7 +17,7 @@ cd "${TOPDIR}" echo '#pragma comment(user, "libxml2 version '"${LIBXML_VERSION}"'")' > os400.c echo '#pragma comment(user, __DATE__)' >> os400.c echo '#pragma comment(user, __TIME__)' >> os400.c -echo '#pragma comment(copyright, "Copyright (C) 1998-2015 Daniel Veillard. OS/400 version by P. Monnerat.")' >> os400.c +echo '#pragma comment(copyright, "Copyright (C) 1998-2017 Daniel Veillard. OS/400 version by P. Monnerat.")' >> os400.c make_module OS400 os400.c LINK= # No need to rebuild service program yet. MODULES= diff --git a/python/setup.py b/python/setup.py index c44269a6..1ac4eaca 100755 --- a/python/setup.py +++ b/python/setup.py @@ -8,7 +8,7 @@ from distutils.core import setup, Extension # Below ROOT, we expect to find include, include/libxml2, lib and bin. # On *nix, it is not needed (but should not harm), # on Windows, it is set by configure.js. -ROOT = r'/usr' +ROOT = r'/usr/local' # Thread-enabled libxml2 with_threads = 1 |