- scheduler: compile fixes for FCGI

svn path=/trunk/boinc/; revision=25955

checkin_notes

@@ -5173,3 +5173,14 @@ Charlie 2 Aug 2012
         make_CharityEngine.sh
         make_GridRepublic.sh
         make_ProgThruProc.sh
+
+David  2 Aug 2012
+    - scheduler: compile fixes for FCGI
+
+    sched/
+        hr_info.cpp
+    html/inc/
+        forum.inc
+    lib/
+        util.cpp
+        filesys.cpp

lib/filesys.cpp

@@ -15,8 +15,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "filesys.h"
-
 #if   defined(_WIN32) && !defined(__STDWX_H__)
 #include "boinc_win.h"
 #elif defined(_WIN32) && defined(__STDWX_H__)
@@ -63,7 +61,7 @@
 #if HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
 #define STATFS statvfs
-#elif defined(HAVE_SYS_STATFS_H)
+#elif HAVE_SYS_STATFS_H
 #include <sys/statfs.h>
 #define STATFS statfs
 #else
@@ -75,6 +73,7 @@
 #include "str_util.h"
 #include "str_replace.h"
 #include "error_numbers.h"
+#include "filesys.h"
 
 #ifdef _WIN32
 typedef BOOL (CALLBACK* FreeFn)(LPCSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER);

lib/util.cpp

@@ -15,6 +15,10 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
+#ifdef _USING_FCGI_
+#include "boinc_fcgi.h"
+#endif
+
 #include "util.h"
 
 #if   defined(_WIN32) && !defined(__STDWX_H__)
@@ -55,11 +59,6 @@ extern "C" {
 #endif
 #endif
 
-#ifdef _USING_FCGI_
-#include "boinc_fcgi.h"
-#define perror FCGI::perror
-#endif
-
 #include "error_numbers.h"
 #include "common_defs.h"
 #include "filesys.h"
@@ -439,7 +438,11 @@ int run_program(
             if (retval) return retval;
         }
         execv(file, argv);
+#ifdef _USING_FCGI_
+        FCGI::perror("execv");
+#else
         perror("execv");
+#endif
         exit(errno);
     }
 

sched/hr_info.cpp

@@ -14,6 +14,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "hr_info.h"
+
 #ifndef _USING_FCGI_
 #include <cstdio>
 #else
@@ -27,8 +30,6 @@
 #include "error_numbers.h"
 #include "sched_msgs.h"
 
-#include "hr_info.h"
-
 int HR_INFO::write_file() {
     int i, j;