* applied matts patch; flattened indention.

* mk_module_init.sh needs to include time.h; some will need it.

diff --git a/citadel/mk_module_init.sh b/citadel/mk_module_init.sh
index 9fbb6d6927ec0d4ccf9453710b978e2c730c15da..d68f90ec296d71753896fde4b92bc0ea20dbc9b2 100755 (executable)
--- a/citadel/mk_module_init.sh
+++ b/citadel/mk_module_init.sh
@@ -36,6 +36,7 @@ $ECHO $MINUS_e " */\n\n\n" >> $C_FILE
 
 #echo $MINUS_e "#include \"sysdep.h\"\n" >> $C_FILE
 $ECHO $MINUS_e "#include <stdlib.h>\n" >> $C_FILE
+$ECHO $MINUS_e "#include <time.h>\n" >> $C_FILE
 #echo $MINUS_e "#include <ctype.h>\n" >> $C_FILE
 #echo $MINUS_e "#include \"citadel.h\"\n" >> $C_FILE
 $ECHO $MINUS_e "#include \"modules_init.h\"\n" >> $C_FILE

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 1413675ea9d07b4bf46745a7249763c7c2eb3fb6..b819acca7eb459af80bbe63e8a10ece9ed837375 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -506,13 +506,14 @@ void flush_output(void) {
        setsockopt(ctx->client_socket, IPPROTO_TCP, TCP_CORK, &off, 4);
        setsockopt(ctx->client_socket, IPPROTO_TCP, TCP_CORK, &on, 4);
 }
-#elif HAVE_DARWIN
+#else 
+#ifdef HAVE_DARWIN
 /* Stub functions for Darwin/OS X where TCP buffering isn't liked at all */
 void buffer_output(void) {
-CC->buffering = 0;
+       CC->buffering = 0;
 }
 void unbuffer_output(void) {
-CC->buffering = 0;
+       CC->buffering = 0;
 }
 void flush_output(void) {
 }
@@ -542,7 +543,8 @@ void unbuffer_output(void) {
                CC->output_buffer = NULL;
        }
 }
-#endif
+#endif /* HAVE_DARWIN */
+#endif /* HAVE_TCP_BUFFERING */