Mesa (7.10): Use C-style system headers in C++ code to avoid issues with std:: namespace

[Ian Romanick]

Module: Mesa
Branch: 7.10
Commit: 5ad00ef7a367b415f47d95f5274bc749301d870d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ad00ef7a367b415f47d95f5274bc749301d870d

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Feb 21 13:15:07 2011 -0800

Use C-style system headers in C++ code to avoid issues with std:: namespace

Based on commit 497baf4e4a6a0a2f247c7bfb9bf69a2b93c2c19f from master.

---

 src/glsl/ast_expr.cpp             |    4 ++--
 src/glsl/ast_type.cpp             |    2 +-
 src/glsl/glsl_parser_extras.h     |    2 +-
 src/glsl/glsl_types.cpp           |    2 +-
 src/glsl/glsl_types.h             |    4 ++--
 src/glsl/ir.h                     |    4 ++--
 src/glsl/ir_import_prototypes.cpp |    2 +-
 src/glsl/ir_reader.cpp            |    2 +-
 src/glsl/link_functions.cpp       |    6 +++---
 src/glsl/linker.cpp               |    8 ++++----
 src/glsl/loop_controls.cpp        |    2 +-
 src/glsl/main.cpp                 |    4 ++--
 src/glsl/s_expression.cpp         |    6 +++---
 src/mesa/program/sampler.cpp      |    2 +-
 14 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/glsl/ast_expr.cpp b/src/glsl/ast_expr.cpp
index 4e83dec..7e0c7bd 100644
--- a/src/glsl/ast_expr.cpp
+++ b/src/glsl/ast_expr.cpp
@@ -20,8 +20,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include <cstdio>
-#include <cassert>
+#include <stdio.h>
+#include <assert.h>
 #include "ast.h"
 
 const char *
diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index 47d4f9f..172b271 100644
--- a/src/glsl/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <cstdio>
+#include <stdio.h>
 #include "ast.h"
 extern "C" {
 #include "program/symbol_table.h"
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index bb77678..9422f61 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -31,7 +31,7 @@
 #ifdef __cplusplus
 
 
-#include <cstdlib>
+#include <stdlib.h>
 #include "glsl_symbol_table.h"
 
 enum _mesa_glsl_parser_targets {
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index f4d9242..76b4f3e 100644
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <cstdio>
+#include <stdio.h>
 #include <stdlib.h>
 #include "main/core.h" /* for Elements */
 #include "glsl_symbol_table.h"
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h
index ab6858f..61bf5e0 100644
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/glsl_types.h
@@ -26,8 +26,8 @@
 #ifndef GLSL_TYPES_H
 #define GLSL_TYPES_H
 
-#include <cstring>
-#include <cassert>
+#include <string.h>
+#include <assert.h>
 
 extern "C" {
 #include "GL/gl.h"
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index c4d2fbf..243723c 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -26,8 +26,8 @@
 #ifndef IR_H
 #define IR_H
 
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "ralloc.h"
 #include "glsl_types.h"
diff --git a/src/glsl/ir_import_prototypes.cpp b/src/glsl/ir_import_prototypes.cpp
index be5e0c1..50fe4ed 100644
--- a/src/glsl/ir_import_prototypes.cpp
+++ b/src/glsl/ir_import_prototypes.cpp
@@ -27,7 +27,7 @@
  *
  * \author Ian Romanick
  */
-#include <cstdio>
+#include <stdio.h>
 #include "ir.h"
 #include "glsl_symbol_table.h"
 
diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
index e395ee9..0e18881 100644
--- a/src/glsl/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <cstdarg>
+#include <stdarg.h>
 
 #include "ir_reader.h"
 #include "glsl_parser_extras.h"
diff --git a/src/glsl/link_functions.cpp b/src/glsl/link_functions.cpp
index 861fa39..19a2eeb 100644
--- a/src/glsl/link_functions.cpp
+++ b/src/glsl/link_functions.cpp
@@ -21,9 +21,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <cstdlib>
-#include <cstdio>
-#include <cstdarg>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
 
 #include "main/core.h"
 #include "glsl_symbol_table.h"
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 61795d0..09eaa72 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -63,10 +63,10 @@
  *
  * \author Ian Romanick <ian.d.romanick at intel.com>
  */
-#include <cstdlib>
-#include <cstdio>
-#include <cstdarg>
-#include <climits>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <limits.h>
 
 #include "main/core.h"
 #include "glsl_symbol_table.h"
diff --git a/src/glsl/loop_controls.cpp b/src/glsl/loop_controls.cpp
index 9eaa50f..9acbadc 100644
--- a/src/glsl/loop_controls.cpp
+++ b/src/glsl/loop_controls.cpp
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <climits>
+#include <limits.h>
 #include "main/compiler.h"
 #include "glsl_types.h"
 #include "loop_analysis.h"
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index efb49f0..83a523a 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -20,8 +20,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include <cstdlib>
-#include <cstdio>
+#include <stdlib.h>
+#include <stdio.h>
 #include <getopt.h>
 
 #include <sys/types.h>
diff --git a/src/glsl/s_expression.cpp b/src/glsl/s_expression.cpp
index 7c45fb8..34e503f 100644
--- a/src/glsl/s_expression.cpp
+++ b/src/glsl/s_expression.cpp
@@ -22,9 +22,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #include "s_expression.h"
 
diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp
index 12c4a40..3778f61 100644
--- a/src/mesa/program/sampler.cpp
+++ b/src/mesa/program/sampler.cpp
@@ -23,7 +23,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <cstdio>
+#include <stdio.h>
 #include "ir.h"
 #include "glsl_types.h"
 #include "ir_visitor.h"