You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/06/25 18:27:09 UTC
cvs commit: xml-xerces/c/src/util/Transcoders/Iconv400 Iconv400TransService.cpp
tng 01/06/25 09:27:09
Modified: c/src Makefile.incl
c/src/util/NetAccessors/Socket UnixHTTPURLInputStream.cpp
c/src/util/Platforms/OS400 OS400PlatformUtils.hpp
c/src/util/Transcoders/Iconv400 Iconv400TransService.cpp
Log:
AS400 changes by Linda Swan.
Revision Changes Path
1.45 +5 -4 xml-xerces/c/src/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/Makefile.incl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Makefile.incl 2001/06/09 18:08:53 1.44
+++ Makefile.incl 2001/06/25 16:27:01 1.45
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.44 2001/06/09 18:08:53 jberry Exp $
+# $Id: Makefile.incl,v 1.45 2001/06/25 16:27:01 tng Exp $
#
###################################################################
@@ -217,14 +217,14 @@
JUSTCC = $(MYCC)
XML_INCL += -I${ICUROOT}/include
ifeq (${SYSOVR},OS400)
-PLATFORM_COMPILE_OPTIONS = -qnotempinc -D_THREAD_SAFE
+PLATFORM_COMPILE_OPTIONS = -qnotempinc
MAKE_SHARED = makeC++SharedLib_r -p 5000
MAKE_SHARED_C = makeC++SharedLib_r -p 5000
TO = qwobj
SHLIBSUFFIX=.a
else
-PLATFORM_COMPILE_OPTIONS = -qnotempinc -D_THREAD_SAFE -D_MULTI_THREADED -D${PLATFORM}
-PLATFORM_C_COMPILE_OPTIONS = -v -D_THREAD_SAFE -D_MULTI_THREADED -D${PLATFORM}
+PLATFORM_COMPILE_OPTIONS = -qnotempinc -D_MULTI_THREADED -D${PLATFORM}
+PLATFORM_C_COMPILE_OPTIONS = -v -D_MULTI_THREADED -D${PLATFORM}
MAKE_SHARED = ld -v
MAKE_SHARED_C = ld -v
SHLIBSUFFIX=.o
@@ -237,6 +237,7 @@
endif
endif
EXTRA_COMPILE_OPTIONS = -I. -g
+EXTRA_LINK_OPTIONS = -q OPTION='*DUPVAR *DUPPROC'
RM2 = -del
1.6 +5 -3 xml-xerces/c/src/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
Index: UnixHTTPURLInputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnixHTTPURLInputStream.cpp 2000/07/21 03:31:41 1.5
+++ UnixHTTPURLInputStream.cpp 2001/06/25 16:27:04 1.6
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log: UnixHTTPURLInputStream.cpp,v $
+ * Revision 1.6 2001/06/25 16:27:04 tng
+ * AS400 changes by Linda Swan.
+ *
* Revision 1.5 2000/07/21 03:31:41 andyh
* Improved (but still weak) http access by the parser.
*
@@ -86,7 +89,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <strings.h>
#include <iostream.h>
#include <unistd.h>
@@ -147,7 +149,7 @@
XMLExcepts::NetAcc_TargetResolution);
}
if ((hostEntPtr =
- gethostbyaddr((const char *) &numAddress,
+ gethostbyaddr((char *) &numAddress,
sizeof(unsigned long), AF_INET)) == NULL)
{
ThrowXML(NetAccessorException,
1.2 +19 -24 xml-xerces/c/src/util/Platforms/OS400/OS400PlatformUtils.hpp
Index: OS400PlatformUtils.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Platforms/OS400/OS400PlatformUtils.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OS400PlatformUtils.hpp 2000/02/10 17:58:07 1.1
+++ OS400PlatformUtils.hpp 2001/06/25 16:27:05 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/**
* $Log: OS400PlatformUtils.hpp,v $
+ * Revision 1.2 2001/06/25 16:27:05 tng
+ * AS400 changes by Linda Swan.
+ *
* Revision 1.1 2000/02/10 17:58:07 abagchi
* Initial checkin
*
@@ -63,17 +66,9 @@
#ifndef _OS400PLATFORMUTILS_H
#define _OS400PLATFORMUTILS_H
-#ifndef X_CAPI
-#ifdef MY_XP_CPLUSPLUS
-# define X_CFUNC extern "C"
-#else
-# define X_CFUNC
-#endif
-#define X_CAPI X_CFUNC
-#endif
-X_CAPI void send_message (char * text, char * messageid, char type);
-X_CAPI void convert_errno(char *,int);
+void send_message (char * text, char * messageid, char type);
+void convert_errno(char *,int);
#define FILE_OPEN_PROBLEMS "XMLBED3" /* file open failure */
#define ICONV_CONVERT_PROBLEM "XMLBED4" /* failed to convert ICONV */
1.7 +4 -11 xml-xerces/c/src/util/Transcoders/Iconv400/Iconv400TransService.cpp
Index: Iconv400TransService.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Transcoders/Iconv400/Iconv400TransService.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Iconv400TransService.cpp 2001/06/19 19:31:03 1.6
+++ Iconv400TransService.cpp 2001/06/25 16:27:08 1.7
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@
*/
/**
- * $Id: Iconv400TransService.cpp,v 1.6 2001/06/19 19:31:03 tng Exp $
+ * $Id: Iconv400TransService.cpp,v 1.7 2001/06/25 16:27:08 tng Exp $
*/
// ---------------------------------------------------------------------------
@@ -65,8 +65,8 @@
#include "Iconv400TransService.hpp"
#include <string.h>
#include <qlgcase.h>
-#include "iconv_cnv.h"
-#include "iconv_util.h"
+#include "iconv_cnv.hpp"
+#include "iconv_util.hpp"
#include <qusec.h>
#include <util/XMLUniDefs.hpp>
#include <util/XMLString.hpp>
@@ -96,13 +96,6 @@
return tmpBuf;
}
-int32_t u_strlen(const XMLCh *s)
-{
- int32_t i=0;
- while(*s++)
- i++;
- return i;
-}
// ---------------------------------------------------------------------------
// Local, const data
// ---------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org