sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r18360@catbus: nickm | 2008-02-21 22:26:32 -0500 

Make torint.h define ssize_t more robustly; add spaces to last patch


svn:r13670
This commit is contained in:
Nick Mathewson 2008-02-22 03:26:35 +00:00
parent 688b7ddf83
commit 031c212776
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/compat.c
View File

@ -779,7 +779,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out)
#ifdef MS_WINDOWS
if (limit > DEFAULT_MAX_CONNECTIONS) {
log_warn(LD_CONFIG,
"We do not support more than %lu file descriptors"
"We do not support more than %lu file descriptors "
"on Windows. Tried to raise to %lu.",
DEFAULT_MAX_CONNECTIONS, limit);
return -1;
@ -787,7 +787,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out)
limit = DEFAULT_MAX_CONNECTIONS;
#elif defined(CYGWIN) || defined(__CYGWIN__)
if (limit > CYGWIN_MAX_CONNECTIONS) {
log_warn(LD_CONFIG, "We do not support more than %lu file descriptors"
log_warn(LD_CONFIG, "We do not support more than %lu file descriptors "
"when using Cygwin. Tried to raise to %lu.",
CYGWIN_MAX_CONNECTIONS, limit);
return -1;
@ -795,7 +795,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out)
limit = CYGWIN_MAX_CONNECTIONS;
#elif defined(IPHONE)
if (limit > IPHONE_MAX_CONNECTIONS) {
log_warn(LD_CONFIG, "We do not support more than %lu file descriptors"
log_warn(LD_CONFIG, "We do not support more than %lu file descriptors "
"on iPhone. Tried to raise to %lu.",
IPHONE_MAX_CONNECTIONS, limit);
return -1;

15
src/common/torint.h
View File

@ -42,11 +42,6 @@
#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
@ -186,6 +181,16 @@ typedef unsigned __int64 uint64_t;
#endif
#endif
#ifndef HAVE_SSIZE_T
#if SIZEOF_SIZE_T == 8
typedef int64_t ssize_t;
#elif SIZEOF_SIZE_T == 4
typedef int32_t ssize_t;
#else
#error "Can't define ssize_t."
#endif
#endif
#if (SIZEOF_VOID_P > 4 && SIZEOF_VOID_P <= 8)
#ifndef HAVE_INTPTR_T
typedef int64_t intptr_t;