about summary refs log tree commit diff stats
path: root/WWW/Library/Implementation/HTUtils.h
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>1998-06-25 20:46:00 -0400
committerThomas E. Dickey <dickey@invisible-island.net>1998-06-25 20:46:00 -0400
commit5488a2e17cfeff78f8927f652ecb9750d7a28c29 (patch)
tree061d9ca743d7c0a2fed37bd1e22cb1f83dd7d051 /WWW/Library/Implementation/HTUtils.h
parent159955668b23e32fb7cefa1638bb40b8b3a58fa9 (diff)
downloadlynx-snapshots-5488a2e17cfeff78f8927f652ecb9750d7a28c29.tar.gz
snapshot of project "lynx", label v2-8-1dev_17
Diffstat (limited to 'WWW/Library/Implementation/HTUtils.h')
-rw-r--r--WWW/Library/Implementation/HTUtils.h22
1 files changed, 17 insertions, 5 deletions
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 68032dab..60dbdac0 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -17,8 +17,25 @@
 #ifdef HAVE_CONFIG_H
 #include <lynx_cfg.h>	/* generated by autoconf 'configure' script */
 #include <sys/types.h>
+#include <stdio.h>
+
+/*
+ * We force this include-ordering since socks.h contains redefinitions of
+ * functions that probably are prototyped via other includes.  The socks.h
+ * definitions have to be included everywhere, since they're making wrappers
+ * for the stdio functions as well as the network functions.
+ */
+#if defined(USE_SOCKS5) && !defined(DONT_USE_SOCKS5)
+#define SOCKS4TO5
+#define SHORTENED_RBIND
+#define SOCKS
+#include <socks.h>
+#endif /* USE_SOCKS5 */
+
 #else
 
+#include <stdio.h>
+
 #define DONT_TRACK_INTERNAL_LINKS 1
 
 /* Explicit system-configure */
@@ -107,10 +124,6 @@
 Debug message control.
 
  */
-#ifndef STDIO_H
-#include <stdio.h>
-#define STDIO_H
-#endif
 
 #ifdef DEBUG
 #define TRACE (WWW_TraceFlag)
@@ -163,7 +176,6 @@ Standard C library for malloc() etc
 
 #include <malloc.h>
 #include <memory.h>
-#include <stdio.h>
 #include <stdlib.h>   /* ANSI */   /* BSN */
 
 #endif /* !ultrix */