get rid of the STDC_HEADERS check... this failed on IRIX with MIPSpro, use checks for individual headers instead

12 files changed, 54 insertions, 24 deletions

diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index 41097628..b9143b77 100644
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -48,10 +48,13 @@
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #ifdef    HAVE_UNISTD_H
 #  include <sys/types.h>
diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index b53dc854..c5ecd3bb 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -34,10 +34,13 @@
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #include <algorithm>
 using namespace std;
diff --git a/src/Image.cc b/src/Image.cc
index b9335902..3a4c14cf 100644
--- a/src/Image.cc
+++ b/src/Image.cc
@@ -50,10 +50,13 @@ typedef unsigned int u_int32_t;
 #  endif
 #endif
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
diff --git a/src/Rootmenu.cc b/src/Rootmenu.cc
index b8c8f2dd..59bfb1cf 100644
--- a/src/Rootmenu.cc
+++ b/src/Rootmenu.cc
@@ -38,10 +38,13 @@
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #ifdef    HAVE_SYS_PARAM_H
 #  include <sys/param.h>
diff --git a/src/Screen.cc b/src/Screen.cc
index 7438a9d8..4d9c66fa 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -50,11 +50,17 @@
 #include "Workspace.h"
 #include "Workspacemenu.h"
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
+#endif // HAVE_STRING_H
+
+#ifdef    HAVE_SYS_TYPES_H
 #  include <sys/types.h>
-#endif // STDC_HEADERS
+#endif // HAVE_SYS_TYPES_H
 
 #ifdef    HAVE_CTYPE_H
 #  include <ctype.h>
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 10a31d70..3d3f867f 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -44,9 +44,9 @@
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
diff --git a/src/Window.cc b/src/Window.cc
index 031b396e..458104cb 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -33,9 +33,9 @@
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #ifdef    DEBUG
 #  ifdef    HAVE_STDIO_H
diff --git a/src/Windowmenu.cc b/src/Windowmenu.cc
index 8483f1ab..af20a9c7 100644
--- a/src/Windowmenu.cc
+++ b/src/Windowmenu.cc
@@ -37,9 +37,9 @@
 #include "Windowmenu.h"
 #include "Workspace.h"
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 
 Windowmenu::Windowmenu(OpenboxWindow &win) : Basemenu(*win.getScreen()),
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 28d752f2..9c44d797 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -54,9 +54,9 @@
 #  include <stdlib.h>
 #endif // HAVE_STDLIB_H
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #include <vector>
 typedef vector<Rect> rectList;
diff --git a/src/i18n.cc b/src/i18n.cc
index 18b77209..5fddea57 100644
--- a/src/i18n.cc
+++ b/src/i18n.cc
@@ -34,11 +34,17 @@
 
 #include <X11/Xlocale.h>
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
+#endif // HAVE_STRING_H
+
+#ifdef    HAVE_STDIO_H
 #  include <stdio.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STDIO_H
 
 #ifdef    HAVE_LOCALE_H
 #  include <locale.h>
diff --git a/src/main.cc b/src/main.cc
index 0a0ad5ba..0b2360ab 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -39,10 +39,13 @@
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #ifdef    HAVE_UNISTD_H
 #include <sys/types.h>
diff --git a/src/openbox.cc b/src/openbox.cc
index b3678664..371feb4b 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -64,10 +64,13 @@
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #ifdef    HAVE_UNISTD_H
 #  include <sys/types.h>