From: Ali Saidi <saidi@eecs.umich.edu>
Date: Mon, 6 Nov 2006 15:15:27 +0000 (-0500)
Subject: replace NULL with 0.... Why isn't NULL defined by default on Mac OS X I don't know
X-Git-Tag: m5_2.0_beta2~53^2~3^2~14
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=430622c173b676c7a53aa5623d5197a26f9c9190;p=gem5.git

replace NULL with 0.... Why isn't NULL defined by default on Mac OS X I don't know

--HG--
extra : convert_revision : b60403445bd4e855732fd4e6753068abd90ecc9d
---

diff --git a/SConstruct b/SConstruct
index ce5ab4bb8..59d40d5cc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -271,8 +271,8 @@ if not conf.CheckLib(py_version_name):
     Exit(1)
 
 # On Solaris you need to use libsocket for socket ops
-if not conf.CheckLibWithHeader(None, 'sys/socket.h', 'C', 'accept(0,NULL,NULL);'):
-   if not conf.CheckLibWithHeader('socket', 'sys/socket.h', 'C', 'accept(0,NULL,NULL);'):
+if not conf.CheckLibWithHeader(None, 'sys/socket.h', 'C++', 'accept(0,0,0);'):
+   if not conf.CheckLibWithHeader('socket', 'sys/socket.h', 'C++', 'accept(0,0,0);'):
        print "Can't find library with socket calls (e.g. accept())"
        Exit(1)