Fixes to compile 64 bit server on Ubuntu 14.04 (g++ 4.8.x)

base/format.cpp

@@ -1,4 +1,5 @@
 #include "base/format.h"
+#include <stdio.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

base/sigslot.h

@@ -107,6 +107,10 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdelete-non-virtual-dtor"
 
+#ifndef NULL
+#define NULL 0
+#endif
+
 namespace base {
 
 	class single_threaded

server/Makefile

@@ -4,11 +4,11 @@
 UNAME := $(shell uname)
 ifeq ($(UNAME), Darwin)
 PRE_CC=g++ -m32
-CC=$(PRE_CC) -Wshorten-64-to-32
+CC=$(PRE_CC) -Wshorten-64-to-32 -DOSX
 endif
 ifeq ($(UNAME), Linux)
-PRE_CC=g++-4.2 -m32
-CC=$(PRE_CC) -Wconversion
+PRE_CC=g++
+CC=$(PRE_CC) -DLINUX
 endif
 
 LD=$(CC)

server/httppost.cpp

@@ -277,7 +277,7 @@ void HttpPost::OnMessage(base::Message *pmsg) {
             SetState(HS_CLOSED);
             CompleteParams *params = (CompleteParams *)pmsg->data;
             if (params->status_code != 200) {
-                RLOG() << "post: " << (dword)this << " status_code: "
+                RLOG() << "post: " << (pword)this << " status_code: "
                         << params->status_code << " error: " << params->error;
             }
             SignalOnComplete(this, params->status_code, params->error, result_);

server/logger.cpp

@@ -3,7 +3,7 @@
 #include "server/server.h"
 #include <sys/stat.h>
 #include <errno.h>
-#include <linux/limits.h>
+#include <limits.h>
 
 namespace wi {
 

server/statsposter.cpp

@@ -101,7 +101,7 @@ void StatsPoster::OnPostComplete(HttpPost *post, int status_code, int error,
             }
         }
     } else {
-        RLOG() << "ERROR: Post " << (dword)post << " not found in posting_!";
+        RLOG() << "ERROR: Post " << (pword)post << " not found in posting_!";
     }
 
     // Schedule more posts 

server/tokenauth.cpp

@@ -5,6 +5,7 @@
 #include "base/base64.h"
 #include "base/format.h"
 #include "base/md5.h"
+#include <string.h>
 #include <string>
 #include <string.h>
 

yajl/wrapper/jsonbuilder.cpp

@@ -1,5 +1,6 @@
 #include <string.h>
 #include "yajl/wrapper/jsonbuilder.h"
+#include <string.h>
 
 namespace json {