r14970@catbus: nickm | 2007-09-06 20:09:39 -0400

Fix compilation on Solaris; Patch from Magne Mahre.


svn:r409
This commit is contained in:
Nick Mathewson 2007-09-07 00:10:15 +00:00
parent ff9e1af68f
commit 9c3ac4e444
3 changed files with 7 additions and 5 deletions

View File

@ -1,3 +1,4 @@
Changes in current version: Changes in current version:
o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr. o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.
o demote most http warnings to debug messages o demote most http warnings to debug messages
o Fix Solaris compilation; from Magne Mahre

View File

@ -38,6 +38,7 @@ dnl Checks for libraries.
AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(socket, socket)
AC_CHECK_LIB(resolv, inet_aton) AC_CHECK_LIB(resolv, inet_aton)
AC_CHECK_LIB(rt, clock_gettime) AC_CHECK_LIB(rt, clock_gettime)
AC_CHECK_LIB(nsl, inet_ntoa)
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
@ -367,12 +368,12 @@ AC_TRY_COMPILE([
AC_MSG_CHECKING([whether our compiler supports __func__]) AC_MSG_CHECKING([whether our compiler supports __func__])
AC_TRY_COMPILE([], AC_TRY_COMPILE([],
[void foo() { const char *cp = __func__; }], [ const char *cp = __func__; ],
AC_MSG_RESULT([yes]), AC_MSG_RESULT([yes]),
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
AC_MSG_CHECKING([whether our compiler supports __FUNCTION__]) AC_MSG_CHECKING([whether our compiler supports __FUNCTION__])
AC_TRY_COMPILE([], AC_TRY_COMPILE([],
[void foo() { const char *cp = __FUNCTION__; }], [ const char *cp = __FUNCTION__; ],
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_DEFINE(__func__, __FUNCTION__, AC_DEFINE(__func__, __FUNCTION__,
[Define to appropriate substitue if compiler doesnt have __func__]), [Define to appropriate substitue if compiler doesnt have __func__]),

View File

@ -821,7 +821,7 @@ test_multiple_events_for_same_fd(void)
cleanup_test(); cleanup_test();
} }
int decode_int(u_int32_t *pnumber, struct evbuffer *evbuf); int decode_int(uint32_t *pnumber, struct evbuffer *evbuf);
void void
read_once_cb(int fd, short event, void *arg) read_once_cb(int fd, short event, void *arg)
@ -872,10 +872,10 @@ void
evtag_int_test(void) evtag_int_test(void)
{ {
struct evbuffer *tmp = evbuffer_new(); struct evbuffer *tmp = evbuffer_new();
u_int32_t integers[TEST_MAX_INT] = { uint32_t integers[TEST_MAX_INT] = {
0xaf0, 0x1000, 0x1, 0xdeadbeef, 0x00, 0xbef000 0xaf0, 0x1000, 0x1, 0xdeadbeef, 0x00, 0xbef000
}; };
u_int32_t integer; uint32_t integer;
int i; int i;
for (i = 0; i < TEST_MAX_INT; i++) { for (i = 0; i < TEST_MAX_INT; i++) {