[haiku-commits] r33547 - haiku/trunk/headers/private/kernel
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 12 Oct 2009 16:27:02 +0200 (CEST)
Author: axeld
Date: 2009-10-12 16:27:02 +0200 (Mon, 12 Oct 2009)
New Revision: 33547
Changeset: http://dev.haiku-os.org/changeset/33547/haiku
Modified:
haiku/trunk/headers/private/kernel/lock.h
Log:
* Added casts to the *_INITIALIZER macros, so that they can also be used in
a member constructor list.
Modified: haiku/trunk/headers/private/kernel/lock.h
===================================================================
--- haiku/trunk/headers/private/kernel/lock.h 2009-10-12 13:59:59 UTC (rev
33546)
+++ haiku/trunk/headers/private/kernel/lock.h 2009-10-12 14:27:02 UTC (rev
33547)
@@ -1,6 +1,6 @@
/*
* Copyright 2008, Ingo Weinhold, ingo_weinhold@xxxxxxx
- * Copyright 2002-2008, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx
+ * Copyright 2002-2009, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx
* Distributed under the terms of the MIT License.
*
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -78,14 +78,16 @@
// static initializers
#if KDEBUG
-# define MUTEX_INITIALIZER(name) { name, NULL, -1, 0 }
-# define RECURSIVE_LOCK_INITIALIZER(name) { MUTEX_INITIALIZER(name), 0 }
+# define MUTEX_INITIALIZER(name) (mutex){ name, NULL,
-1, 0 }
+# define RECURSIVE_LOCK_INITIALIZER(name) \
+ (recursive_lock){ MUTEX_INITIALIZER(name), 0 }
#else
-# define MUTEX_INITIALIZER(name) { name, NULL, 0, 0 }
-# define RECURSIVE_LOCK_INITIALIZER(name) { MUTEX_INITIALIZER(name), -1,
0 }
+# define MUTEX_INITIALIZER(name) (mutex){ name, NULL, 0,
0 }
+# define RECURSIVE_LOCK_INITIALIZER(name) \
+ (recursive_lock){ MUTEX_INITIALIZER(name), -1, 0 }
#endif
-#define RW_LOCK_INITIALIZER(name) { name, NULL, -1, 0, 0,
0 }
+#define RW_LOCK_INITIALIZER(name) (rw_lock){ name, NULL,
-1, 0, 0, 0 }
#if KDEBUG
Other related posts:
- » [haiku-commits] r33547 - haiku/trunk/headers/private/kernel - axeld
