- Ensure SIZE_MAX is defined in C++ and hence PRISIZET is set correctly 
  and hence fscanf for .mbinmap reads a sane value.



git-svn-id: http://svn.tribler.org/libswift/branches/ppsp-03@32466 001aeff7-3401-0410-a489-f7902fc005dd

Author: arno

binmap.cpp

@@ -1,3 +1,5 @@
+// Arno, 2013-06-11: Must come first to ensure SIZE_MAX etc are defined
+#include "compat.h"
 #include <cassert>
 #include <cstddef>
 #include <cstdlib>

cmdgw.cpp

@@ -6,14 +6,13 @@
  *  Copyright 2010-2012 TECHNISCHE UNIVERSITEIT DELFT. All rights reserved.
  *
  */
-#include <iostream>
-#include <sstream>
-
 #include "swift.h"
 #include <event2/buffer.h>
 #include <event2/bufferevent.h>
 #include <event2/listener.h>
 
+#include <iostream>
+#include <sstream>
 
 using namespace swift;
 

compat.h

@@ -19,6 +19,8 @@ typedef int int32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 #else
+// Arno, 2013-06-11: Must be defined to get SIZE_MAX in C++
+#define  __STDC_LIMIT_MACROS
 #include <stdint.h>
 #endif
 
@@ -42,6 +44,7 @@ typedef unsigned __int64 uint64_t;
 #include <sys/stat.h>
 #endif
 
+#include <limits.h>
 #include <fcntl.h>
 #include <cstdio>
 #include <cstdlib>
@@ -92,7 +95,6 @@ typedef void* setsockoptptr_t;
 #endif
 
 #ifndef LONG_MAX
-#include <limits>
 #define LONG_MAX	numeric_limits<int>::max()
 #endif
 
@@ -103,6 +105,10 @@ typedef void* setsockoptptr_t;
 
 
 // Arno, 2012-01-05: Handle 64-bit size_t & printf+scanf
+#ifndef SIZE_MAX
+#error SIZE_MAX undefined, check stdint.h and __STDC_LIMIT_MACROS
+#endif
+
 #if SIZE_MAX > UINT_MAX
 #define PRISIZET	"%llu"
 #else

hashtree.cpp

@@ -6,7 +6,7 @@
  *  Copyright 2009-2016 TECHNISCHE UNIVERSITEIT DELFT. All rights reserved.
  *
  */
-
+#include "compat.h"
 #include "hashtree.h"
 #include "bin_utils.h"
 //#include <openssl/sha.h>
@@ -15,7 +15,6 @@
 #include <cstring>
 #include <cstdlib>
 #include <fcntl.h>
-#include "compat.h"
 #include "swift.h"
 
 #include <iostream>

sendrecv.cpp

@@ -6,13 +6,14 @@
  *  Copyright 2009-2016 TECHNISCHE UNIVERSITEIT DELFT. All rights reserved.
  *
  */
+// Arno, 2013-06-11: Must come first to ensure SIZE_MAX etc are defined
+#include "compat.h"
 #include "bin_utils.h"
 #include "swift.h"
 #include <algorithm>  // kill it
 #include <cassert>
 #include <cfloat>
 #include <sstream>
-#include "compat.h"
 
 using namespace swift;
 using namespace std;

swift.h

@@ -64,6 +64,8 @@
 #ifndef SWIFT_H
 #define SWIFT_H
 
+// Arno, 2013-06-11: Must come first to ensure SIZE_MAX etc are defined
+#include "compat.h"
 #include <deque>
 #include <vector>
 #include <set>
@@ -72,7 +74,6 @@
 #include <algorithm>
 #include <string>
 
-#include "compat.h"
 #include <event2/event.h>
 #include <event2/event_struct.h>
 #include <event2/buffer.h>

transfer.cpp

@@ -6,10 +6,10 @@
  *  Copyright 2009-2016 TECHNISCHE UNIVERSITEIT DELFT. All rights reserved.
  *
  */
+#include "swift.h"
 #include <errno.h>
 #include <string>
 #include <sstream>
-#include "swift.h"
 
 #include "ext/seq_picker.cpp" // FIXME FIXME FIXME FIXME
 #include "ext/vod_picker.cpp"

zerohashtree.cpp

@@ -7,7 +7,7 @@
  *  Copyright 2009-2016 TECHNISCHE UNIVERSITEIT DELFT. All rights reserved.
  *
  */
-
+#include "compat.h"
 #include "hashtree.h"
 #include "bin_utils.h"
 //#include <openssl/sha.h>
@@ -16,7 +16,6 @@
 #include <cstring>
 #include <cstdlib>
 #include <fcntl.h>
-#include "compat.h"
 #include "swift.h"
 
 #include <iostream>