Include stdio.h and stdlib.h everywhere, and don't cook our own #define NULL.

ast_function.cpp

@@ -21,7 +21,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <cstdio>
 #include "glsl_symbol_table.h"
 #include "ast.h"
 #include "glsl_types.h"

ast_to_hir.cpp

@@ -48,7 +48,7 @@
  * As a result, my preference is to put as little C code as possible in the
  * parser (and lexer) sources.
  */
-#include <stdio.h>
+
 #include "main/imports.h"
 #include "glsl_symbol_table.h"
 #include "glsl_parser_extras.h"

hir_field_selection.cpp

@@ -20,13 +20,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include <stdio.h>
+
+#include "ir.h"
 #include "main/imports.h"
 #include "symbol_table.h"
 #include "glsl_parser_extras.h"
 #include "ast.h"
 #include "glsl_types.h"
-#include "ir.h"
 
 struct ir_rvalue *
 _mesa_ast_field_selection_to_hir(const ast_expression *expr,

ir.h

@@ -26,6 +26,9 @@
 #ifndef IR_H
 #define IR_H
 
+#include <cstdio>
+#include <cstdlib>
+
 #include "list.h"
 #include "ir_visitor.h"
 #include "ir_hierarchical_visitor.h"

ir_basic_block.cpp

@@ -27,7 +27,6 @@
  * Basic block analysis of instruction streams.
  */
 
-#include <stdio.h>
 #include "ir.h"
 #include "ir_visitor.h"
 #include "ir_basic_block.h"

ir_constant_expression.cpp

@@ -33,7 +33,6 @@
  *    * Initializers for \c const variables
  */
 
-#define NULL 0
 #include <math.h>
 #include "ir.h"
 #include "ir_visitor.h"

ir_constant_folding.cpp

@@ -26,7 +26,6 @@
  * Replace constant-valued expressions with references to constant values.
  */
 
-#define NULL 0
 #include "ir.h"
 #include "ir_visitor.h"
 #include "ir_optimization.h"

ir_constant_variable.cpp

@@ -32,8 +32,6 @@
  * and calls to builtin functions.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "ir.h"
 #include "ir_print_visitor.h"
 #include "ir_visitor.h"

ir_copy_propagation.cpp

@@ -32,7 +32,6 @@
  * help anyway by triggering other optimizations that live in the HIR.
  */
 
-#include <stdio.h>
 #include "ir.h"
 #include "ir_visitor.h"
 #include "ir_print_visitor.h"

ir_dead_code.cpp

@@ -27,7 +27,6 @@
  * Eliminates dead assignments and variable declarations from the code.
  */
 
-#define NULL 0
 #include "ir.h"
 #include "ir_visitor.h"
 #include "ir_expression_flattening.h"

ir_dead_code_local.cpp

@@ -33,7 +33,6 @@
  * for assignments to variables that are never read.
  */
 
-#include <stdio.h>
 #include "ir.h"
 #include "ir_print_visitor.h"
 #include "ir_basic_block.h"

ir_expression_flattening.cpp

@@ -33,7 +33,6 @@
  * instruction stream.
  */
 
-#define NULL 0
 #include "ir.h"
 #include "ir_visitor.h"
 #include "ir_expression_flattening.h"

ir_function_can_inline.cpp

@@ -33,7 +33,6 @@
  * (0) loop surrounding the function body.
  */
 
-#define NULL 0
 #include "ir.h"
 
 class ir_function_can_inline_visitor : public ir_hierarchical_visitor {

ir_function_inlining.cpp

@@ -27,7 +27,6 @@
  * Replaces calls to functions with the body of the function.
  */
 
-#define NULL 0
 #include "ir.h"
 #include "ir_visitor.h"
 #include "ir_function_inlining.h"

ir_hierarchical_visitor.cpp

@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#define NULL 0
+
 #include "ir.h"
 #include "ir_hierarchical_visitor.h"
 

ir_hv_accept.cpp

@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#define NULL 0
+
 #include "ir.h"
 
 /**

ir_if_simplification.cpp

@@ -28,7 +28,6 @@
  * instruction stream.
  */
 
-#define NULL 0
 #include "ir.h"
 
 class ir_if_simplification_visitor : public ir_hierarchical_visitor {

ir_print_visitor.cpp

@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include <cstdio>
+
 #include "ir_print_visitor.h"
 #include "glsl_types.h"
 #include "glsl_parser_extras.h"

ir_reader.cpp

@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include <cstdio>
+
 #include <cstdarg>
 
 extern "C" {

ir_swizzle_swizzle.cpp

@@ -27,7 +27,6 @@
  * Eliminates the second swizzle in a swizzle chain.
  */
 
-#include <stdio.h>
 #include "ir.h"
 #include "ir_visitor.h"
 #include "ir_optimization.h"

ir_variable.cpp

@@ -21,10 +21,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <stdio.h>
+#include "ir.h"
 #include "glsl_parser_extras.h"
 #include "glsl_symbol_table.h"
-#include "ir.h"
 #include "builtin_variables.h"
 
 #ifndef Elements

ir_vec_index_to_swizzle.cpp

@@ -29,7 +29,6 @@
  * and codegen backends not have to worry about this case.
  */
 
-#include <stdio.h>
 #include "ir.h"
 #include "ir_visitor.h"
 #include "ir_optimization.h"