summaryrefslogtreecommitdiff
path: root/hurd
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@gnu.org>2008-12-04 21:32:48 +0100
committerNeal H. Walfield <neal@gnu.org>2008-12-04 21:32:48 +0100
commitfe2a8eec056be7e4cde8734a66f1c17bc42bd82c (patch)
tree1345ffa35805dcc9ea0f537e830fa11a4fbc9ef3 /hurd
parentb444b2a448e0c7e09356e87ae6553f399c4d9574 (diff)
Use 0, not NULL.
2008-12-04 Neal H. Walfield <neal@gnu.org> * lock.h: Don't include <atomic.h>. (ss_lock_trace_dump): Set FUNC to 0, not NULL.
Diffstat (limited to 'hurd')
-rw-r--r--hurd/ChangeLog5
-rw-r--r--hurd/lock.h3
2 files changed, 6 insertions, 2 deletions
diff --git a/hurd/ChangeLog b/hurd/ChangeLog
index 28d4f3c..6c5463a 100644
--- a/hurd/ChangeLog
+++ b/hurd/ChangeLog
@@ -1,5 +1,10 @@
2008-12-04 Neal H. Walfield <neal@gnu.org>
+ * lock.h: Don't include <atomic.h>.
+ (ss_lock_trace_dump): Set FUNC to 0, not NULL.
+
+2008-12-04 Neal H. Walfield <neal@gnu.org>
+
* bits/ia32/math.h: New file.
* math.h: New file.
* headers.m4: Link sysroot/include/hurd/math.h to hurd/math.h and
diff --git a/hurd/lock.h b/hurd/lock.h
index a5775eb..18aacfb 100644
--- a/hurd/lock.h
+++ b/hurd/lock.h
@@ -23,7 +23,6 @@
#include <l4/thread.h>
#include <l4/ipc.h>
-#include <atomic.h>
#include <assert.h>
#ifndef NDEBUG
@@ -77,7 +76,7 @@ ss_lock_trace_dump (void *lock)
if (trace->lock != lock)
continue;
- __const char *func = NULL;
+ __const char *func = 0;
switch (trace->func)
{
case SS_MUTEX_LOCK: