diff options
Diffstat (limited to 'os400')
-rw-r--r-- | os400/initscript.sh | 4 | ||||
-rw-r--r-- | os400/libxmlrpg/schemasInternals.rpgle | 2 | ||||
-rw-r--r-- | os400/libxmlrpg/xmlreader.rpgle | 2 | ||||
-rw-r--r-- | os400/libxmlrpg/xmlstring.rpgle | 4 | ||||
-rw-r--r-- | os400/make-src.sh | 2 | ||||
-rw-r--r-- | os400/make.sh | 2 | ||||
-rw-r--r-- | os400/os400config.h.in | 56 | ||||
-rw-r--r-- | os400/wrappers.c | 2 | ||||
-rw-r--r-- | os400/wrappers.h | 2 |
9 files changed, 10 insertions, 66 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/schemasInternals.rpgle b/os400/libxmlrpg/schemasInternals.rpgle index 8d3013ef..765ed007 100644 --- a/os400/libxmlrpg/schemasInternals.rpgle +++ b/os400/libxmlrpg/schemasInternals.rpgle @@ -2,7 +2,7 @@ * Description: internal interfaces for the XML Schemas handling * and schema validity checking * The Schemas development is a Work In Progress. - * Some of those interfaces are not garanteed to be API or + * Some of those interfaces are not guaranteed to be API or * ABI stable ! * * Copy: See Copyright for the status of this software. diff --git a/os400/libxmlrpg/xmlreader.rpgle b/os400/libxmlrpg/xmlreader.rpgle index 9ec76b3b..f9ab207a 100644 --- a/os400/libxmlrpg/xmlreader.rpgle +++ b/os400/libxmlrpg/xmlreader.rpgle @@ -624,7 +624,7 @@ * @arg: the user argument * @msg: the message * @severity: the severity of the error - * @locator: a locator indicating where the error occured + * @locator: a locator indicating where the error occurred * * Signature of an error callback from a reader parser 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/os400/make.sh b/os400/make.sh index 95a35a28..860365eb 100644 --- a/os400/make.sh +++ b/os400/make.sh @@ -34,7 +34,7 @@ fi # Copy some documentation files if needed. for TEXT in "${TOPDIR}/AUTHORS" "${TOPDIR}/ChangeLog" \ - "${TOPDIR}/Copyright" "${TOPDIR}/HACKING" "${TOPDIR}/README" \ + "${TOPDIR}/Copyright" "${TOPDIR}/CONTRIBUTING" "${TOPDIR}/README" \ "${TOPDIR}/MAINTAINERS" "${TOPDIR}/NEWS" "${TOPDIR}/TODO" \ "${TOPDIR}/TODO_SCHEMAS" "${TOPDIR}/os400/README400" do if [ -f "${TEXT}" ] diff --git a/os400/os400config.h.in b/os400/os400config.h.in index 3966ac81..1840c17c 100644 --- a/os400/os400config.h.in +++ b/os400/os400config.h.in @@ -6,9 +6,6 @@ *** Author: Patrick Monnerat <pm@datasphere.ch>, DATASPHERE S.A. **/ -/* Define to 1 if you have the <ansidecl.h> header file. */ -#undef HAVE_ANSIDECL_H - /* Define to 1 if you have the <arpa/inet.h> header file. */ #define HAVE_ARPA_INET_H 1 @@ -18,9 +15,6 @@ /* Whether struct sockaddr::__ss_family exists */ #undef HAVE_BROKEN_SS_FAMILY -/* Define to 1 if you have the `class' function. */ -#undef HAVE_CLASS - /* Define to 1 if you have the <ctype.h> header file. */ #define HAVE_CTYPE_H 1 @@ -42,24 +36,12 @@ /* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 -/* Define to 1 if you have the `finite' function. */ -#undef HAVE_FINITE - /* Define to 1 if you have the <float.h> header file. */ #define HAVE_FLOAT_H 1 -/* Define to 1 if you have the `fpclass' function. */ -#undef HAVE_FPCLASS - /* Define to 1 if you have the `fprintf' function. */ #undef HAVE_FPRINTF /* Use trio. */ -/* Define to 1 if you have the `fp_class' function. */ -#undef HAVE_FP_CLASS - -/* Define to 1 if you have the <fp_class.h> header file. */ -#undef HAVE_FP_CLASS_H - /* Define to 1 if you have the `ftime' function. */ #undef HAVE_FTIME @@ -69,9 +51,6 @@ /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY -/* Define to 1 if you have the <ieeefp.h> header file. */ -#undef HAVE_IEEEFP_H - /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 @@ -84,15 +63,9 @@ /* Define if isnan is there */ #undef HAVE_ISNAN -/* Define to 1 if you have the `isnand' function. */ -#undef HAVE_ISNAND - /* Define if history library is there (-lhistory) */ #undef HAVE_LIBHISTORY -/* Have compression library */ -#undef HAVE_LIBLZMA - /* Define if pthread library is there (-lpthread) */ #undef HAVE_LIBPTHREAD @@ -108,9 +81,6 @@ /* Define to 1 if you have the `localtime' function. */ #define HAVE_LOCALTIME 1 -/* Define to 1 if you have the <lzma.h> header file. */ -#undef HAVE_LZMA_H - /* Define to 1 if you have the <malloc.h> header file. */ #undef HAVE_MALLOC_H @@ -131,9 +101,6 @@ # undef /**/ HAVE_MMAP #endif -/* Define to 1 if you have the <nan.h> header file. */ -#undef HAVE_NAN_H - /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ #undef HAVE_NDIR_H @@ -206,12 +173,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - /* Define to 1 if you have the `strftime' function. */ #define HAVE_STRFTIME 1 @@ -221,9 +182,6 @@ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 -/* Define to 1 if you have the `strndup' function. */ -#undef HAVE_STRNDUP - /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */ #undef HAVE_SYS_DIR_H @@ -274,17 +232,6 @@ /* Define to 1 if you have the `vsprintf' function. */ #undef HAVE_VSPRINTF /* Use trio. */ -/* Define to 1 if you have the <zlib.h> header file. */ -/* Actually dependent on the compilation script. */ -#if @WITH_ZLIB@ -#define HAVE_ZLIB_H 1 -#else -#undef HAVE_ZLIB_H -#endif - -/* Define to 1 if you have the `_stat' function. */ -#undef HAVE__STAT - /* Whether __va_copy() is available */ #undef HAVE___VA_COPY @@ -333,9 +280,6 @@ #define below would cause a syntax error. */ #undef _UINT32_T -/* Using the Win32 Socket implementation */ -#undef _WINSOCKAPI_ - /* ss_family is not defined here, use __ss_family instead */ #undef ss_family diff --git a/os400/wrappers.c b/os400/wrappers.c index 9f592b79..06f6c269 100644 --- a/os400/wrappers.c +++ b/os400/wrappers.c @@ -110,7 +110,7 @@ _lx_dlerror(void) } -#ifdef HAVE_ZLIB_H +#ifdef LIBXML_ZLIB_ENABLED #include <zlib.h> gzFile diff --git a/os400/wrappers.h b/os400/wrappers.h index 388ec8c2..6f3e6c9d 100644 --- a/os400/wrappers.h +++ b/os400/wrappers.h @@ -43,7 +43,7 @@ extern void * _lx_dlsym(void * handle, const char * symbol); extern char * _lx_dlerror(void); -#ifdef HAVE_ZLIB_H +#ifdef LIBXML_ZLIB_ENABLED #include <zlib.h> |