From 7e2c48fa09cd52fad3e8c7f582c4e642cb3eeef3 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 30 Sep 2010 22:16:18 +0000
Subject: [PATCH] - undo recent change to str_util.h; it broke FCGI compile

svn path=/trunk/boinc/; revision=22435
---
 checkin_notes  |  6 ++++
 lib/str_util.h | 86 ++++++++++++++++++--------------------------------
 2 files changed, 37 insertions(+), 55 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 168c8472b9..80b2767969 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6990,3 +6990,9 @@ David  30 Sept 2010
 
     sched/
         sched_customize.cpp
+
+David  30 Sept 2010
+    - undo recent change to str_util.h; it broke FCGI compile
+
+    lib/
+        str_util.h
diff --git a/lib/str_util.h b/lib/str_util.h
index ebc8efa4e2..027f484a73 100644
--- a/lib/str_util.h
+++ b/lib/str_util.h
@@ -18,73 +18,27 @@
 #ifndef STR_UTIL_H
 #define STR_UTIL_H
 
-#ifdef __cplusplus
-  #include <cstdlib>
-  #include <ctime>
-  #include <cctype>
-  #include <cstring>
-  #include <string>
-  #include <vector>
-#else
-  #include <stdlib.h>
-  #include <time.h>
-  #include <ctype.h>
-  #include <string.h>
-#endif /* __cplusplus */
+#include <cstdlib>
+#include <ctime>
+#include <cctype>
+#include <cstring>
+#include <string>
+#include <vector>
 
 #define KILO (1024.0)
 #define MEGA (1048576.0)
 #define GIGA (1024.*1048576.0)
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern int ndays_to_string(double x, int smallest_timescale, char *buf);
 extern void nbytes_to_string(double nbytes, double total_bytes, char* str, int len);
 extern int parse_command_line(char*, char**);
 extern void c2x(char *what);
 extern void strip_whitespace(char *str);
-
+extern void strip_whitespace(std::string&);
 #define safe_strcpy(x, y) strlcpy(x, y, sizeof(x))
 #define safe_strcat(x, y) if (strlen(x)+strlen(y)<sizeof(x)) strcat(x, y)
 extern char* time_to_string(double);
 extern char* precision_time_to_string(double);
-
-inline void downcase_string(char* p) {
-    while (*p) {
-        *p = (char)tolower((int)*p);
-        p++;
-    }
-}
-
-extern int string_substitute(
-    const char* haystack, char* out, int out_len,
-    const char* needle, const char* target
-);
-
-// returns short text description of error corresponding to
-// int errornumber from error_numbers.h
-//
-extern const char* boincerror(int which_error);
-extern const char* network_status_string(int);
-extern const char* rpc_reason_string(int);
-extern const char* suspend_reason_string(int reason);
-
-#ifdef __cplusplus
-}
-#endif
-
-// C++ Specific pieces
-#ifdef __cplusplus
-
-// convert UNIX time to MySQL timestamp (yyyymmddhhmmss)
-//
-extern void mysql_timestamp(double, char*);
-
-extern void strip_whitespace(std::string&);
-
 extern std::string timediff_format(double);
 
 inline bool ends_with(std::string const& s, std::string const& suffix) {
@@ -103,7 +57,29 @@ inline void downcase_string(std::string& w) {
     }
 }
 
-#endif /* __cplusplus */
+inline void downcase_string(char* p) {
+    while (*p) {
+        *p = (char)tolower((int)*p);
+        p++;
+    }
+}
 
-#endif /* STR_UTIL_H */
+extern int string_substitute(
+    const char* haystack, char* out, int out_len,
+    const char* needle, const char* target
+);
 
+// convert UNIX time to MySQL timestamp (yyyymmddhhmmss)
+//
+extern void mysql_timestamp(double, char*);
+
+// returns short text description of error corresponding to
+// int errornumber from error_numbers.h
+//
+extern const char* boincerror(int which_error);
+extern const char* network_status_string(int);
+extern const char* rpc_reason_string(int);
+extern const char* suspend_reason_string(int reason);
+
+
+#endif