summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog7
-rw-r--r--src/tinyproxy.h16
2 files changed, 19 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f751dc0..1f6ab44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-22 Robert James Kaes <rjkaes@flarenet.com>
+
+ * src/tinyproxy.h: Add a test for the MSG_NOSIGNAL define, so it's
+ apparently a non-standard extension to send(). Also, moved the
+ <sys/resource.h> include after the includes for the various time
+ include files.
+
2001-12-19 Robert James Kaes <rjkaes@flarenet.com>
* src/reqs.c (write_message): Encapsulate code to handle sending
diff --git a/src/tinyproxy.h b/src/tinyproxy.h
index 61a00a7..02efd71 100644
--- a/src/tinyproxy.h
+++ b/src/tinyproxy.h
@@ -1,4 +1,4 @@
-/* $Id: tinyproxy.h,v 1.23 2001-11-26 05:23:49 rjkaes Exp $
+/* $Id: tinyproxy.h,v 1.24 2001-12-23 03:28:03 rjkaes Exp $
*
* See 'tinyproxy.c' for a detailed description.
*
@@ -40,9 +40,6 @@
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
-#ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
-#endif
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h>
#endif
@@ -71,6 +68,9 @@
# endif
#endif
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
#ifdef HAVE_SYS_UIO_H
# include <sys/uio.h>
#endif
@@ -158,6 +158,14 @@
# include <wctype.h>
#endif
+/*
+ * If MSG_NOSIGNAL is not defined, define it to be zero so that it doesn't
+ * cause any problems.
+ */
+#ifndef MSG_NOSIGNAL
+# define MSG_NOSIGNAL (0)
+#endif
+
#ifndef SHUT_RD /* these three Posix.1g names are quite new */
# define SHUT_RD 0 /* shutdown for reading */
# define SHUT_WR 1 /* shutdown for writing */