[PATCH 1/5] Move X_DEPRECATED to misc.h so it can be used outside resource.h
Jamey Sharp
jamey at minilop.net
Thu Apr 29 12:24:47 PDT 2010
From: Keith Packard <keithp at keithp.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Jamey Sharp <jamey at minilop.net>
---
include/misc.h | 6 ++++++
include/resource.h | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/misc.h b/include/misc.h
index 62d813e..c7add25 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -100,6 +100,12 @@ typedef unsigned long ATOM;
#define FALSE 0
#endif
+#ifdef __GNUC__
+#define X_DEPRECATED __attribute__((deprecated))
+#else
+#define X_DEPRECATED
+#endif
+
#ifndef _XTYPEDEF_CALLBACKLISTPTR
typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */
#define _XTYPEDEF_CALLBACKLISTPTR
diff --git a/include/resource.h b/include/resource.h
index 7948af5..56450d6 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -251,12 +251,6 @@ extern _X_EXPORT RESTYPE TypeMask;
* Please use the noted replacements instead.
*/
-#ifdef __GNUC__
-#define X_DEPRECATED __attribute__((deprecated))
-#else
-#define X_DEPRECATED
-#endif
-
/* replaced by dixLookupResourceByType */
extern _X_EXPORT pointer SecurityLookupIDByType(
ClientPtr client,
--
1.7.0
More information about the xorg-devel
mailing list