Changeset 2444

Timestamp:

03/23/08 00:23:08 (10 months ago)

Author:

edmanm

Message:

r256@lysithea: edmanm | 2008-03-23 00:22:58 -0400
Check for limits.h and sys/limits.h, and include them in zlibbytearray.cpp so
we can use UINT_MAX.

Location:

vidalia/trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• config.h.in (modified) (1 diff)
• src/util/zlibbytearray.cpp (modified) (1 diff)

vidalia/trunk/CMakeLists.txt

@@ -32 +32 @@
 include(${QT_USE_FILE})
 include(${CMAKE_SOURCE_DIR}/cmake/VidaliaMacros.cmake)
+include(CheckIncludeFile)
 include(CheckIncludeFileCXX)
+include(CheckTypeSize)
 include(CPack)
 
@@ -61 +63 @@
 endif(USE_QSSLSOCKET)
 
+## Check for system header files
+check_include_file("limits.h" HAVE_LIMITS_H)
+check_include_file("sys/limits.h" HAVE_SYS_LIMITS_H)
+
+## Check fo the sizes of various data types
+check_type_size(int SIZEOF_INT)
+
 ## Write out a configuration file
 configure_file(

vidalia/trunk/config.h.in

@@ -3 +3 @@
 
 #cmakedefine USE_QSSLSOCKET
+
+#cmakedefine HAVE_LIMITS_H
+
+#cmakedefine HAVE_SYS_LIMITS_H
+
+#cmakedefine SIZEOF_INT @SIZEOF_INT@
+

vidalia/trunk/src/util/zlibbytearray.cpp

@@ -52 +52 @@
 
 #include <QString>
+
+#include "config.h"
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#elif HAVE_SYS_LIMITS_H
+#include <sys/limits.h>
+#endif
+
+/* The following check for UINT_MAX is derived from Tor's torint.h. See
+ * the top of this file for details on Tor's license. */
+#ifndef UINT_MAX
+#if (SIZEOF_INT == 2)
+#define UINT_MAX 0xffffu
+#elif (SIZEOF_INT == 4)
+#define UINT_MAX 0xffffffffu
+#elif (SIZEOF_INT == 8)
+#define UINT_MAX 0xffffffffffffffffu
+#else
+#error "Your platform uses a sizeof(int) that we don't understand."
+#endif
+#endif
 
 #include "zlib.h"