You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@locus.apache.org on 2000/11/09 02:37:51 UTC
cvs commit: xml-xerces/c/src/util HashPtr.cpp
andyh 00/11/08 17:37:49
Modified: c/samples Makefile.incl configure runConfigure
c/samples/CreateDOMDocument Makefile.in
c/samples/DOMCount Makefile.in
c/samples/DOMPrint Makefile.in
c/samples/EnumVal Makefile.in
c/samples/MemParse Makefile.in
c/samples/PParse Makefile.in
c/samples/Redirect Makefile.in
c/samples/SAX2Count Makefile.in
c/samples/SAX2Print Makefile.in
c/samples/SAXCount Makefile.in
c/samples/SAXPrint Makefile.in
c/samples/StdInParse Makefile.in
c/src Makefile.incl configure runConfigure
c/src/util HashPtr.cpp
Log:
Build updates for Solaris 2.8 64 bit. Contributed by Andrei Smirnov <as...@hotjobs.com>
Revision Changes Path
1.25 +4 -4 xml-xerces/c/samples/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Makefile.incl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.incl 2000/09/11 18:43:43 1.24
+++ Makefile.incl 2000/11/09 01:37:05 1.25
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.24 2000/09/11 18:43:43 aruna1 Exp $
+# $Id: Makefile.incl,v 1.25 2000/11/09 01:37:05 andyh Exp $
#
################## LIBRARY NAMES AND DIRECTORIES ##################
@@ -100,13 +100,13 @@
ifeq (${COMPILER}, g++)
CMP= -c ${CXXFLAGS}
CC= g++ -c -D${PLATFORM} -D_REENTRANT -fpic
- LINK = g++ -D${PLATFORM} -fpic
+ LINK = g++ -D${PLATFORM} -fpic ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
EXTRA_LINK_OPTIONS=-lc
else
CMP= -c ${CXXFLAGS}
CC= CC -c -D${PLATFORM} -D_REENTRANT -pic
- LINK = CC -D${PLATFORM}
+ LINK = CC -D${PLATFORM} ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
EXTRA_LINK_OPTIONS=-lc -lgen
endif
@@ -243,4 +243,4 @@
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
SHLIBSUFFIX=.so
-endif
\ No newline at end of file
+endif
1.12 +2 -1 xml-xerces/c/samples/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure 2000/08/09 18:53:43 1.11
+++ configure 2000/11/09 01:37:06 1.12
@@ -1333,8 +1333,8 @@
cflags=${CFLAGS}
+ldflags=${LDFLAGS}
-
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@@ -1509,6 +1509,7 @@
s%@compiler@%$compiler%g
s%@cxxflags@%$cxxflags%g
s%@cflags@%$cflags%g
+s%@ldflags@%$ldflags%g
CEOF
EOF
1.14 +5 -1 xml-xerces/c/samples/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/runConfigure,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- runConfigure 2000/08/01 18:27:21 1.13
+++ runConfigure 2000/11/09 01:37:06 1.14
@@ -58,7 +58,7 @@
#
#
-# $Id: runConfigure,v 1.13 2000/08/01 18:27:21 aruna1 Exp $
+# $Id: runConfigure,v 1.14 2000/11/09 01:37:06 andyh Exp $
#
#
@@ -137,6 +137,9 @@
-z)
compileroptions="$compileroptions $2"; shift 2;;
+ -l)
+ linkeroptions=$2; shift 2;;
+
-h)
usage
exit ${ERROR_EXIT_CODE};;
@@ -217,6 +220,7 @@
# Set the extra C and C++ compiler flags
CXXFLAGS="$compileroptions $debugflag $compileroption"; export CXXFLAGS
CFLAGS="$compileroptions $debugflag $compileroption"; export CFLAGS
+LDFLAGS="$linkeroptions"; export LDFLAGS
echo
rm -f config.cache
1.8 +2 -1 xml-xerces/c/samples/CreateDOMDocument/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/CreateDOMDocument/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 2000/06/19 22:39:14 1.7
+++ Makefile.in 2000/11/09 01:37:11 1.8
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.7 2000/06/19 22:39:14 aruna1 Exp $
+# $Id: Makefile.in,v 1.8 2000/11/09 01:37:11 andyh Exp $
#
###################################################################
@@ -71,6 +71,7 @@
COMPILER = @compiler@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
+LDFLAGS = @ldflags@
PREFIX = @prefix@
include ../../version.incl
1.9 +2 -1 xml-xerces/c/samples/DOMCount/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/DOMCount/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 2000/06/19 22:39:26 1.8
+++ Makefile.in 2000/11/09 01:37:15 1.9
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.8 2000/06/19 22:39:26 aruna1 Exp $
+# $Id: Makefile.in,v 1.9 2000/11/09 01:37:15 andyh Exp $
#
###################################################################
@@ -71,6 +71,7 @@
COMPILER = @compiler@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
+LDFLAGS = @ldflags@
PREFIX = @prefix@
include ../../version.incl
1.9 +2 -1 xml-xerces/c/samples/DOMPrint/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/DOMPrint/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 2000/06/19 22:39:35 1.8
+++ Makefile.in 2000/11/09 01:37:17 1.9
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.8 2000/06/19 22:39:35 aruna1 Exp $
+# $Id: Makefile.in,v 1.9 2000/11/09 01:37:17 andyh Exp $
#
###################################################################
@@ -72,6 +72,7 @@
COMPILER = @compiler@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
+LDFLAGS = @ldflags@
PREFIX = @prefix@
include ../../version.incl
1.10 +2 -1 xml-xerces/c/samples/EnumVal/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/EnumVal/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 2000/06/26 18:24:54 1.9
+++ Makefile.in 2000/11/09 01:37:19 1.10
@@ -53,7 +53,7 @@
# on the Apache Software Foundation, please see
# <http://www.apache.org/>.
#
-# $Id: Makefile.in,v 1.9 2000/06/26 18:24:54 aruna1 Exp $
+# $Id: Makefile.in,v 1.10 2000/11/09 01:37:19 andyh Exp $
#
###################################################################
@@ -70,6 +70,7 @@
COMPILER = @compiler@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
+LDFLAGS = @ldflags@
PREFIX = @prefix@
include ../../version.incl
1.9 +2 -1 xml-xerces/c/samples/MemParse/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/MemParse/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 2000/06/19 22:39:53 1.8
+++ Makefile.in 2000/11/09 01:37:22 1.9
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.8 2000/06/19 22:39:53 aruna1 Exp $
+# $Id: Makefile.in,v 1.9 2000/11/09 01:37:22 andyh Exp $
#
###################################################################
@@ -71,6 +71,7 @@
COMPILER = @compiler@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
+LDFLAGS = @ldflags@
PREFIX = @prefix@
include ../../version.incl
1.9 +2 -1 xml-xerces/c/samples/PParse/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/PParse/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 2000/06/19 22:40:01 1.8
+++ Makefile.in 2000/11/09 01:37:24 1.9
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.8 2000/06/19 22:40:01 aruna1 Exp $
+# $Id: Makefile.in,v 1.9 2000/11/09 01:37:24 andyh Exp $
#
###################################################################
@@ -71,6 +71,7 @@
COMPILER = @compiler@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
+LDFLAGS = @ldflags@
PREFIX = @prefix@
include ../../version.incl
1.9 +2 -1 xml-xerces/c/samples/Redirect/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Redirect/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 2000/06/19 22:40:07 1.8
+++ Makefile.in 2000/11/09 01:37:27 1.9
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.8 2000/06/19 22:40:07 aruna1 Exp $
+# $Id: Makefile.in,v 1.9 2000/11/09 01:37:27 andyh Exp $
#
###################################################################
@@ -71,6 +71,7 @@
COMPILER = @compiler@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
+LDFLAGS = @ldflags@
PREFIX = @prefix@
include ../../version.incl
1.3 +2 -1 xml-xerces/c/samples/SAX2Count/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAX2Count/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 2000/09/11 18:43:52 1.2
+++ Makefile.in 2000/11/09 01:37:29 1.3
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.2 2000/09/11 18:43:52 aruna1 Exp $
+# $Id: Makefile.in,v 1.3 2000/11/09 01:37:29 andyh Exp $
#
###################################################################
@@ -71,6 +71,7 @@
COMPILER = @compiler@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
+LDFLAGS = @ldflags@
PREFIX = @prefix@
include ../../version.incl
1.3 +2 -1 xml-xerces/c/samples/SAX2Print/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAX2Print/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 2000/09/11 18:43:57 1.2
+++ Makefile.in 2000/11/09 01:37:31 1.3
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.2 2000/09/11 18:43:57 aruna1 Exp $
+# $Id: Makefile.in,v 1.3 2000/11/09 01:37:31 andyh Exp $
#
###################################################################
@@ -71,6 +71,7 @@
COMPILER = @compiler@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
+LDFLAGS = @ldflags@
PREFIX = @prefix@
include ../../version.incl
1.9 +2 -1 xml-xerces/c/samples/SAXCount/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAXCount/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 2000/06/19 22:40:13 1.8
+++ Makefile.in 2000/11/09 01:37:34 1.9
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.8 2000/06/19 22:40:13 aruna1 Exp $
+# $Id: Makefile.in,v 1.9 2000/11/09 01:37:34 andyh Exp $
#
###################################################################
@@ -71,6 +71,7 @@
COMPILER = @compiler@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
+LDFLAGS = @ldflags@
PREFIX = @prefix@
include ../../version.incl
1.9 +2 -1 xml-xerces/c/samples/SAXPrint/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAXPrint/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 2000/06/19 22:40:20 1.8
+++ Makefile.in 2000/11/09 01:37:36 1.9
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.8 2000/06/19 22:40:20 aruna1 Exp $
+# $Id: Makefile.in,v 1.9 2000/11/09 01:37:36 andyh Exp $
#
###################################################################
@@ -71,6 +71,7 @@
COMPILER = @compiler@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
+LDFLAGS = @ldflags@
PREFIX = @prefix@
include ../../version.incl
1.10 +2 -1 xml-xerces/c/samples/StdInParse/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/StdInParse/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 2000/06/19 22:40:27 1.9
+++ Makefile.in 2000/11/09 01:37:38 1.10
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.9 2000/06/19 22:40:27 aruna1 Exp $
+# $Id: Makefile.in,v 1.10 2000/11/09 01:37:38 andyh Exp $
#
###################################################################
@@ -71,6 +71,7 @@
COMPILER = @compiler@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
+LDFLAGS = @ldflags@
PREFIX = @prefix@
include ../../version.incl
1.33 +5 -5 xml-xerces/c/src/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/Makefile.incl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Makefile.incl 2000/09/06 21:17:09 1.32
+++ Makefile.incl 2000/11/09 01:37:41 1.33
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.32 2000/09/06 21:17:09 aruna1 Exp $
+# $Id: Makefile.incl,v 1.33 2000/11/09 01:37:41 andyh Exp $
#
###################################################################
@@ -110,8 +110,8 @@
ifeq (${PLATFORM}, SOLARIS)
ifeq (${CXX}, g++)
PLATFORM_COMPILE_OPTIONS = -fPIC -instances=static -D${PLATFORM} -D_REENTRANT
- MAKE_SHARED = ${CXX} -D${PLATFORM} -shared
- MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib \
-licu-uc -licudata -lm -lgen
@@ -122,8 +122,8 @@
else
PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -ptr$(XML_OBJ_DIR) \
-features=rtti -D${PLATFORM} -D_REENTRANT
- MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(XML_OBJ_DIR)
- MAKE_SHARED_C = ${CC} -D${PLATFORM} -G
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(XML_OBJ_DIR) ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
ifeq (${TRANSCODER}, ICU)
ALLLIBS = -mt ${LIBS} -L/usr/local/SUNWspro/lib -L/usr/ccs/lib \
-licu-uc -licudata -lc -lgen
1.21 +1 -1 xml-xerces/c/src/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/configure,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- configure 2000/08/17 21:03:16 1.20
+++ configure 2000/11/09 01:37:44 1.21
@@ -1337,7 +1337,7 @@
cflags=${CFLAGS}
-ldflags=${LDCFLAGS}
+ldflags=${LDFLAGS}
libs=${LIBS}
1.34 +5 -1 xml-xerces/c/src/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/runConfigure,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- runConfigure 2000/08/01 18:26:30 1.33
+++ runConfigure 2000/11/09 01:37:44 1.34
@@ -55,7 +55,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: runConfigure,v 1.33 2000/08/01 18:26:30 aruna1 Exp $
+# $Id: runConfigure,v 1.34 2000/11/09 01:37:44 andyh Exp $
#
#
@@ -423,6 +423,9 @@
CFLAGS="$compileroptions $debugflag $transcodingDefines $msgloaderDefines $threadingDefines $netaccessorDefines"
export CFLAGS
+LDFLAGS="$linkeroptions"
+export LDFLAGS
+
LIBS="$transcodingLibs $threadingLibs $netaccessorLibs"
export LIBS
@@ -448,6 +451,7 @@
echo export CXX=\"$CXX\"
echo export CXXFLAGS=\"$CXXFLAGS\"
echo export CFLAGS=\"$CFLAGS\"
+echo export LDFLAGS=\"$LDFLAGS\"
echo export LIBS=\"$LIBS\"
echo export NETACCESSOR=\"$NETACCESSOR\"
echo configure $configureoptions
1.3 +13 -13 xml-xerces/c/src/util/HashPtr.cpp
Index: HashPtr.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/HashPtr.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HashPtr.cpp 2000/09/06 00:24:16 1.2
+++ HashPtr.cpp 2000/11/09 01:37:48 1.3
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 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
@@ -67,7 +67,7 @@
unsigned int HashPtr::getHashVal(const void *const key, unsigned int mod)
{
- return ((int)key % mod);
+ return ((long)key % mod);
}
bool HashPtr::equals(const void *const key1, const void *const key2)