Build fixes for Red Hat 6.2.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@248

diff --git a/coregrind/vg_include.h b/coregrind/vg_include.h
index 5dca560c60418e41e6e69bff26fde453db22f775..f280ef876c30de6a0e7687d1aa1c6109351b08c3 100644 (file)
--- a/coregrind/vg_include.h
+++ b/coregrind/vg_include.h
@@ -672,7 +672,9 @@ extern void VG_(restore_host_signals)
    ------------------------------------------------------------------ */
 
 
-#define NULL ((void*)0)
+#if !defined(NULL)
+#  define NULL ((void*)0)
+#endif
 
 extern void VG_(exit)( Int status )
             __attribute__ ((__noreturn__));

diff --git a/coregrind/vg_unsafe.h b/coregrind/vg_unsafe.h
index bbc417d98f8c13f55a180e227096b4f077820153..260def91b46f4f1faf692448aad441f96b05e0ef 100644 (file)
--- a/coregrind/vg_unsafe.h
+++ b/coregrind/vg_unsafe.h
@@ -62,7 +62,10 @@
 
 #include <asm/ioctls.h>   /* for stuff for dealing with ioctl :( */
 #include <sys/soundcard.h> /* for various soundcard ioctl constants :( */
-#include <linux/rtc.h>     /* for RTC_* ioctls */
+
+#ifndef GLIBC_2_1
+#  include <linux/rtc.h>   /* for RTC_* ioctls */
+#endif
 
 #include <termios.h>
 #include <pty.h>

diff --git a/vg_include.h b/vg_include.h
index 5dca560c60418e41e6e69bff26fde453db22f775..f280ef876c30de6a0e7687d1aa1c6109351b08c3 100644 (file)
--- a/vg_include.h
+++ b/vg_include.h
@@ -672,7 +672,9 @@ extern void VG_(restore_host_signals)
    ------------------------------------------------------------------ */
 
 
-#define NULL ((void*)0)
+#if !defined(NULL)
+#  define NULL ((void*)0)
+#endif
 
 extern void VG_(exit)( Int status )
             __attribute__ ((__noreturn__));

diff --git a/vg_syscall_mem.c b/vg_syscall_mem.c
index cee1ac5c607522fad6059aaf2f819f2378c576c1..472f8f3a7ca8e2f173c572dd70af995e81be9462 100644 (file)
--- a/vg_syscall_mem.c
+++ b/vg_syscall_mem.c
@@ -1779,6 +1779,7 @@ void VG_(perform_assumed_nonblocking_syscall) ( ThreadId tid )
                break;
 
             /* Real Time Clock (/dev/rtc) ioctls */
+#           ifndef GLIBC_2_1
             case RTC_UIE_ON:
             case RTC_UIE_OFF:
             case RTC_AIE_ON:
@@ -1808,6 +1809,7 @@ void VG_(perform_assumed_nonblocking_syscall) ( ThreadId tid )
                if(!VG_(is_kerror) && res == 0)
                    make_readable(arg3, sizeof(unsigned long));
                break;
+#           endif /* GLIBC_2_1 */
 
             /* CD ROM stuff (??)  */
             case CDROMSUBCHNL:

diff --git a/vg_unsafe.h b/vg_unsafe.h
index bbc417d98f8c13f55a180e227096b4f077820153..260def91b46f4f1faf692448aad441f96b05e0ef 100644 (file)
--- a/vg_unsafe.h
+++ b/vg_unsafe.h
@@ -62,7 +62,10 @@
 
 #include <asm/ioctls.h>   /* for stuff for dealing with ioctl :( */
 #include <sys/soundcard.h> /* for various soundcard ioctl constants :( */
-#include <linux/rtc.h>     /* for RTC_* ioctls */
+
+#ifndef GLIBC_2_1
+#  include <linux/rtc.h>   /* for RTC_* ioctls */
+#endif
 
 #include <termios.h>
 #include <pty.h>