64 bit upgrade

Author: Duion

CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 2.3)
 
-# if(CMAKE_COMPILER_IS_GNUCXX)
-#  set( CMAKE_CXX_FLAGS "/GLOBAL_FLAGS_GO_HERE")
-#  set( CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O2")
-#  set( CMAKE_CXX_FLAGS_RELEASE  "-Wall -O2")
-# endif()
-set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -m32")
+ if(CMAKE_COMPILER_IS_GNUCXX)
+  set( CMAKE_CXX_FLAGS "/GLOBAL_FLAGS_GO_HERE")
+  set( CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O2")
+  set( CMAKE_CXX_FLAGS_RELEASE  "-Wall -O2")
+ endif()
+#set(CMAKE_CXX_FLAGS "-Wall -g -m32")
 
 PROJECT(pbms)
 OPTION(SERVERSTORE_RAM "Build using ServerStoreRAM" ON)

include/commonTypes.h

@@ -7,6 +7,7 @@
  * NOTE: These type defines are 32bit/64bit x86 arch biased.
  */
 
+/*
 typedef signed char      S8;
 typedef signed short     S16;
 typedef signed int       S32;
@@ -16,6 +17,19 @@ typedef unsigned char      U8;
 typedef unsigned short     U16;
 typedef unsigned int       U32;
 typedef unsigned long long U64;
+*/
+
+#include <stdint.h>
+
+typedef int8_t S8;
+typedef int16_t S16;
+typedef int32_t S32;
+typedef int64_t S64;
+
+typedef uint8_t U8;
+typedef uint16_t U16;
+typedef uint32_t U32;
+typedef uint64_t U64;
 
 typedef float  F32;
 typedef double F64;

masterd/core.cc

@@ -34,7 +34,8 @@ using namespace std;
 
 #if !defined(WIN32) && defined(__GNUC__)
 	#include <signal.h>
-//	#include <sys/types.h>
+	#include <sys/types.h>
+        #include <unistd.h>
 	#define stricmp strcasecmp
 	#define strnicmp strncasecmp
 #endif
@@ -191,7 +192,7 @@ char* strnextfield(char *str, size_t *clen)
 
 	// update previous field's length to caller
 	if(clen)
-		*clen = (U32)p - (U32)str;
+		*clen = (U64)p - (U64)str;
 
 	// find the field after whitespaces
 	num = strspn(p, whitespaces);
@@ -765,7 +766,7 @@ void MasterdCore::CreatePrefs(void)
 			}
 
 			// figure out string length before newline
-			len = ((U32)str2 - (U32)str);
+			len = ((U64)str2 - (U64)str);
 
 			// write out string just before newline
 			fout << CONFIG_LINE_COMMENT;