[vidalia-svn] r2444: Check for limits.h and sys/limits.h, and include them in zli (in vidalia/trunk: . src/util)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-03-23 00:23:08 -0400 (Sun, 23 Mar 2008)
New Revision: 2444

Modified:
   vidalia/trunk/
   vidalia/trunk/CMakeLists.txt
   vidalia/trunk/config.h.in
   vidalia/trunk/src/util/zlibbytearray.cpp
Log:
 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.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r256] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/CMakeLists.txt
===================================================================
--- vidalia/trunk/CMakeLists.txt	2008-03-22 17:49:49 UTC (rev 2443)
+++ vidalia/trunk/CMakeLists.txt	2008-03-23 04:23:08 UTC (rev 2444)
@@ -31,7 +31,9 @@
 set(QT_USE_QTXML      true)
 include(${QT_USE_FILE})
 include(${CMAKE_SOURCE_DIR}/cmake/VidaliaMacros.cmake)
+include(CheckIncludeFile)
 include(CheckIncludeFileCXX)
+include(CheckTypeSize)
 include(CPack)
 
 if(MSVC_IDE)
@@ -60,6 +62,13 @@
   endif(MSVC OR UNIX)
 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(
   ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in

Modified: vidalia/trunk/config.h.in
===================================================================
--- vidalia/trunk/config.h.in	2008-03-22 17:49:49 UTC (rev 2443)
+++ vidalia/trunk/config.h.in	2008-03-23 04:23:08 UTC (rev 2444)
@@ -2,3 +2,10 @@
 #cmakedefine HAVE_QSSLSOCKET_H
 
 #cmakedefine USE_QSSLSOCKET
+
+#cmakedefine HAVE_LIMITS_H
+
+#cmakedefine HAVE_SYS_LIMITS_H
+
+#cmakedefine SIZEOF_INT @SIZEOF_INT@
+

Modified: vidalia/trunk/src/util/zlibbytearray.cpp
===================================================================
--- vidalia/trunk/src/util/zlibbytearray.cpp	2008-03-22 17:49:49 UTC (rev 2443)
+++ vidalia/trunk/src/util/zlibbytearray.cpp	2008-03-23 04:23:08 UTC (rev 2444)
@@ -52,6 +52,27 @@
 
 #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"
 #include "zlibbytearray.h"