more header juggling

diff --git a/examples/echo.c b/examples/echo.c
index 6a17406..6e71b1f 100644 (file)
--- a/examples/echo.c
+++ b/examples/echo.c
@@ -11,23 +11,26 @@
  *
  */
 #ifndef lint
-static const char rcsid[] = "$Id: echo.c,v 1.4 1999/07/27 19:01:38 roberts Exp $";
+static const char rcsid[] = "$Id: echo.c,v 1.5 1999/07/28 00:29:37 roberts Exp $";
 #endif /* not lint */
 
-#include "fcgi_stdio.h"
+#include "fcgi_config.h"
+
+#include <stdlib.h>
 
-#if defined HAVE_UNISTD_H || __linux__
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#include <stdlib.h>
-
 #ifdef _WIN32
 #include <process.h>
 #else
 extern char **environ;
 #endif
 
+#include "fcgi_stdio.h"
+
+
 static void PrintEnv(char *label, char **envp)
 {
     printf("%s:<br>\n<pre>\n", label);

diff --git a/examples/echo2.c b/examples/echo2.c
index f40f725..51f92bc 100644 (file)
--- a/examples/echo2.c
+++ b/examples/echo2.c
@@ -11,23 +11,25 @@
  *
  */
 #ifndef lint
-static const char rcsid[] = "$Id: echo2.c,v 1.6 1999/07/27 19:01:39 roberts Exp $";
+static const char rcsid[] = "$Id: echo2.c,v 1.7 1999/07/28 00:29:38 roberts Exp $";
 #endif /* not lint */
 
-#include "fcgiapp.h"
+#include "fcgi_config.h"
+
+#include <stdlib.h>
 
-#if defined HAVE_UNISTD_H || __linux__
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#include <stdlib.h>
-
 #ifdef _WIN32
 #include <process.h>
 #else
 extern char **environ;
 #endif
 
+#include "fcgiapp.h"
+
 static void PrintEnv(FCGX_Stream *out, char *label, char **envp)
 {
     FCGX_FPrintF(out, "%s:<br>\n<pre>\n", label);

diff --git a/examples/log-dump.c b/examples/log-dump.c
index b3d8263..16e639f 100644 (file)
--- a/examples/log-dump.c
+++ b/examples/log-dump.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * log-dump.c --
  *
  *     FastCGI example program to illustrate both an Authorizer and a
@@ -14,20 +14,13 @@
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  */
-
 #ifndef lint
-static const char rcsid[] = "$Id: log-dump.c,v 1.3 1999/07/26 05:33:01 roberts Exp $";
+static const char rcsid[] = "$Id: log-dump.c,v 1.4 1999/07/28 00:30:10 roberts Exp $";
 #endif /* not lint */
 
-#if defined HAVE_UNISTD_H || defined __linux__
-#include <unistd.h>
-#endif
-#include <sys/types.h>
-#if defined __linux__
-int kill(pid_t pid, int sig);
-#endif
+#include "fcgi_config.h"
 
-#include "fcgi_stdio.h"
+#include <sys/types.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
@@ -35,6 +28,16 @@ int kill(pid_t pid, int sig);
 #include <fcntl.h>
 #include <errno.h>
 
+#if defined __linux__
+int kill(pid_t pid, int sig);
+#endif
+
+#if defined HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "fcgi_stdio.h"
+
 #ifndef NULL
 #define NULL 0
 #endif
@@ -51,7 +54,7 @@ int main(void)
     int fd, n, i, j;
     char temp[4096];
     char temp2[5000];
-    
+
     while(FCGI_Accept() >= 0) {
         rolePtr = getenv("FCGI_ROLE");
        if(rolePtr == NULL) {
@@ -135,6 +138,6 @@ int main(void)
            continue;
        }
     }
-       
+
     exit(0);
 }

diff --git a/include/fcgiapp.h b/include/fcgiapp.h
index f05e36d..f0f331b 100644 (file)
--- a/include/fcgiapp.h
+++ b/include/fcgiapp.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * fcgiapp.h --
  *
  *      Definitions for FastCGI application server programs
@@ -9,33 +9,35 @@
  * See the file "LICENSE.TERMS" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * $Id: fcgiapp.h,v 1.2 1999/07/26 04:28:10 roberts Exp $
+ * $Id: fcgiapp.h,v 1.3 1999/07/28 00:27:51 roberts Exp $
  */
 
 #ifndef _FCGIAPP_H
 #define _FCGIAPP_H
 
-#ifndef TCL_LIBRARY    /* Hack to see if we are building TCL since TCL
-                        * needs varargs not stdarg
-                        */
-#ifdef _WIN32
-#ifndef DLLAPI
-#define DLLAPI __declspec(dllimport)
-#endif
-#else
-#define DLLAPI
-#endif
-
+/* Hack to see if we are building TCL - TCL needs varargs not stdarg */
+#ifndef TCL_LIBRARY
 #include <stdarg.h>
 #else
 #include <varargs.h>
-#endif /* TCL_LIBARARY */
-#include "fcgi_config.h"
+#endif
 
 #if defined (c_plusplus) || defined (__cplusplus)
 extern "C" {
 #endif
 
+#ifdef _WIN32
+
+#ifndef DLLAPI
+#define DLLAPI __declspec(dllimport)
+#endif
+
+#else  /* !_WIN32 */
+
+#define DLLAPI
+
+#endif /* !_WIN32 */
+
 /*
  * Error codes.  Assigned to avoid conflict with EOF and errno(2).
  */
@@ -78,7 +80,7 @@ typedef struct FCGX_Stream {
 typedef char **FCGX_ParamArray;
 
 /*
- * State associated with a request.  
+ * State associated with a request.
  *
  * Its exposed for API simplicity, DON'T use it - it WILL change!
  */
@@ -145,7 +147,7 @@ DLLAPI void FCGX_InitRequest(FCGX_Request *request);
  *
  * FCGX_Accept_r --
  *
- *      Accept a new request (multi-thread safe).  Be sure to call 
+ *      Accept a new request (multi-thread safe).  Be sure to call
  *     FCGX_Init() first.
  *
  * Results:
@@ -265,7 +267,7 @@ DLLAPI void FCGX_Finish(void);
  *      FCGX_CALL_SEQ_ERROR.
  *
  * Results:
- *      0 for a normal return, < 0 for error 
+ *      0 for a normal return, < 0 for error
  *
  *----------------------------------------------------------------------
  */
@@ -415,7 +417,7 @@ DLLAPI  int FCGX_HasSeenEOF(FCGX_Stream *stream);
  *
  * Results:
  *     The byte, or EOF (-1) if an error occurred.
- * 
+ *
  *----------------------------------------------------------------------
  */
 DLLAPI int FCGX_PutChar(int c, FCGX_Stream *stream);
@@ -432,7 +434,7 @@ DLLAPI int FCGX_PutChar(int c, FCGX_Stream *stream);
  * Results:
  *      Number of bytes written (n) for normal return,
  *      EOF (-1) if an error occurred.
- * 
+ *
  *----------------------------------------------------------------------
  */
 DLLAPI int FCGX_PutStr(const char *str, int n, FCGX_Stream *stream);
@@ -447,7 +449,7 @@ DLLAPI int FCGX_PutStr(const char *str, int n, FCGX_Stream *stream);
  * Results:
  *      number of bytes written for normal return,
  *      EOF (-1) if an error occurred.
- * 
+ *
  *----------------------------------------------------------------------
  */
 DLLAPI int FCGX_PutS(const char *str, FCGX_Stream *stream);
@@ -463,7 +465,7 @@ DLLAPI int FCGX_PutS(const char *str, FCGX_Stream *stream);
  * Results:
  *      number of bytes written for normal return,
  *      EOF (-1) if an error occurred.
- * 
+ *
  *----------------------------------------------------------------------
  */
 DLLAPI int FCGX_FPrintF(FCGX_Stream *stream, const char *format, ...);
@@ -484,7 +486,7 @@ DLLAPI int FCGX_VFPrintF(FCGX_Stream *stream, const char *format, va_list arg);
  *
  * Results:
  *      EOF (-1) if an error occurred.
- * 
+ *
  *----------------------------------------------------------------------
  */
 DLLAPI int FCGX_FFlush(FCGX_Stream *stream);
@@ -510,7 +512,7 @@ DLLAPI int FCGX_FFlush(FCGX_Stream *stream);
  *
  * Results:
  *      EOF (-1) if an error occurred.
- * 
+ *
  *----------------------------------------------------------------------
  */
 DLLAPI int FCGX_FClose(FCGX_Stream *stream);

diff --git a/include/fcgios.h b/include/fcgios.h
index 357d127..6c33638 100755 (executable)
--- a/include/fcgios.h
+++ b/include/fcgios.h
@@ -18,23 +18,41 @@
 #ifndef _FCGIOS_H
 #define _FCGIOS_H
 
+#include "fcgi_config.h"
+
 #ifdef _WIN32
 #include <io.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#if defined (c_plusplus) || defined (__cplusplus)
+extern "C" {
+#endif
+
+
+#ifdef _WIN32
+
 #define OS_Errno GetLastError()
 #define OS_SetErrno(err) SetLastError(err)
+
 #ifndef DLLAPI
 #define DLLAPI __declspec(dllimport)
 #endif
 
-#else /* !_WIN32 */
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+#ifndef O_NONBLOCK
+#define O_NONBLOCK     0x0004  /* no delay */
 #endif
+
+#else /* !_WIN32 */
+
 #define DLLAPI
 #define OS_Errno errno
 #define OS_SetErrno(err) errno = (err)
-#endif /* !_WIN32 */
 
+#endif /* !_WIN32 */
 
 /* This is the initializer for a "struct timeval" used in a select() call
  * right after a new request is accept()ed to determine readablity.  Its
@@ -67,16 +85,6 @@
 #define X_OK       0x01
 #endif
 
-#ifdef _WIN32
-#ifndef O_NONBLOCK
-#define O_NONBLOCK     0x0004  /* no delay */
-#endif
-#endif
-
-#if defined (c_plusplus) || defined (__cplusplus)
-extern "C" {
-#endif
-
 #ifndef _CLIENTDATA
 #   if defined(__STDC__) || defined(__cplusplus)
     typedef void *ClientData;