[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r8670: Move definition of ssize_t to torint.h (in tor/trunk: . src/common src/or)
Author: nickm
Date: 2006-10-09 11:47:08 -0400 (Mon, 09 Oct 2006)
New Revision: 8670
Modified:
tor/trunk/
tor/trunk/src/common/torint.h
tor/trunk/src/or/or.h
Log:
r8971@totoro: nickm | 2006-10-09 10:16:23 -0400
Move definition of ssize_t to torint.h
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r8971] on 96637b51-b116-0410-a10e-9941ebb49b64
Modified: tor/trunk/src/common/torint.h
===================================================================
--- tor/trunk/src/common/torint.h 2006-10-09 15:46:21 UTC (rev 8669)
+++ tor/trunk/src/common/torint.h 2006-10-09 15:47:08 UTC (rev 8670)
@@ -41,6 +41,11 @@
#include <inttypes.h>
#endif
+#ifdef MS_WINDOWS
+/* Windows likes to capitalize ssize_t. Charming. */
+#define ssize_t SSIZE_T
+#endif
+
#if (SIZEOF_INT8_T != 0)
#define HAVE_INT8_T
#endif
Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h 2006-10-09 15:46:21 UTC (rev 8669)
+++ tor/trunk/src/or/or.h 2006-10-09 15:47:08 UTC (rev 8670)
@@ -110,7 +110,6 @@
#include <process.h>
#include <direct.h>
#include <windows.h>
-#define ssize_t SSIZE_T
#define snprintf _snprintf
#endif