Changeset 23508 for main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/oaiservr

Timestamp:

2010-12-17T14:04:10+13:00 (14 years ago)

Author:

sjm84

Message:

Committing 64 bit changes into the branch

Location:

main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/oaiservr

Files:

• Makefile.in (modified) (2 diffs)
• oaiargs.cpp (modified) (2 diffs)

main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/oaiservr/Makefile.in

@@ -38 +38 @@
 ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@
 ifeq ($(ENABLE_ACCENTFOLD), 1)
-ifeq ($(COMPAT32BITFLAGS),)
 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a
-else
-ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib64/libiconv.a
-endif
 else
 ACCENTFOLD_LIBS = 
@@ -93 +89 @@
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
+CFLAGS = @CFLAGS@
 CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
+CXXFLAGS = @CXXFLAGS@
 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
 INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) $(MGPP_INCLUDES)
-LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
+LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
     $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)

main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/oaiservr/oaiargs.cpp

@@ -25 +25 @@
  *********************************************************************/
 
+#include "mglong.h"
 #include "oaiargs.h"
 #include "cgiutils.h"
@@ -77 +78 @@
     text_t label, value;
     if (equals == NULL) {
-      label.setcarr((char *) start, (long) here - (long) start);
+      label.setcarr((char *) start, (uintptr_t) here - (uintptr_t) start);
       value = label;
     }
     else {
-      label.setcarr((char *) start, (long) equals - (long) start);
+      label.setcarr((char *) start, (uintptr_t) equals - (uintptr_t) start);
       ++equals;
-      value.setcarr((char *) equals, (long) here - (long) equals);
+      value.setcarr((char *) equals, (uintptr_t) here - (uintptr_t) equals);
     }