Misc. updates to get a clean make on Linux. A bit of

hack - I didn't bother figuring out autoconf.

Modified Files: fcgi_stdio.c os_unix.c

diff --git a/libfcgi/fcgi_stdio.c b/libfcgi/fcgi_stdio.c
index fa3f64c..befd500 100644 (file)
--- a/libfcgi/fcgi_stdio.c
+++ b/libfcgi/fcgi_stdio.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: fcgi_stdio.c,v 1.3 1998/03/09 16:38:15 roberts Exp $";
+static const char rcsid[] = "$Id: fcgi_stdio.c,v 1.4 1999/01/30 22:24:09 roberts Exp $";
 #endif /* not lint */
 
 #ifdef _WIN32
@@ -315,8 +315,8 @@ int FCGI_fclose(FCGI_FILE *fp)
 
 int FCGI_fflush(FCGI_FILE *fp)
 {
-    if(fp == null)\r
-       return fflush(NULL);\r
+    if(fp == NULL)
+       return fflush(NULL);
     if(fp->stdio_stream)
         return fflush(fp->stdio_stream);
     else if(fp->fcgx_stream)
@@ -724,7 +724,7 @@ void FCGI_clearerr(FCGI_FILE *fp)
         FCGX_ClearError(fp->fcgx_stream);
     }
     return;
-}\r
+}
 \f
 /*
  *----------------------------------------------------------------------
@@ -736,8 +736,8 @@ void FCGI_clearerr(FCGI_FILE *fp)
  *----------------------------------------------------------------------
  */
 FCGI_FILE *FCGI_tmpfile(void)
-{\r
-       return FCGI_OpenFromFile(tmpfile());
+{
+       return FCGI_OpenFromFILE(tmpfile());
 }
 
 \f

diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c
index 73e4618..038e509 100755 (executable)
--- a/libfcgi/os_unix.c
+++ b/libfcgi/os_unix.c
@@ -17,7 +17,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: os_unix.c,v 1.5 1998/12/09 05:41:38 roberts Exp $";
+static const char rcsid[] = "$Id: os_unix.c,v 1.6 1999/01/30 22:24:11 roberts Exp $";
 #endif /* not lint */
 
 #include "fcgimisc.h"
@@ -972,8 +972,12 @@ int OS_FcgiIpcAccept(char *clientAddrList)
         struct sockaddr_un un;
         struct sockaddr_in in;
     } sa;
+#if defined __linux__
+    socklen_t clilen;
+#else
     int clilen;
-    
+#endif    
+
     if (AcquireLock(TRUE) < 0) {
         return (-1);
     }
@@ -1109,7 +1113,11 @@ int OS_IsFcgi()
         struct sockaddr_in in;
         struct sockaddr_un un;
     } sa;
+#if defined __linux__
+    socklen_t len = sizeof(sa);
+#else
     int len = sizeof(sa);
+#endif
 
     if (getpeername(FCGI_LISTENSOCK_FILENO, (struct sockaddr *)&sa, &len) != 0 
             && errno == ENOTCONN)