summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-04-29 12:24:47 -0700
committerKeith Packard <keithp@keithp.com>2010-04-30 12:50:31 -0700
commit7dde50c649089b03650d6497079a690feea65e22 (patch)
tree26f1407cdd251961faa3017b228c8f160a53a314
parent5623908aeef70e5083f3b49986c7547ed044fedd (diff)
Move X_DEPRECATED to misc.h so it can be used outside resource.h
Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jamey Sharp <jamey@minilop.net>
-rw-r--r--include/misc.h6
-rw-r--r--include/resource.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/include/misc.h b/include/misc.h
index 62d813e0c..c7add253e 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 7948af50e..56450d67a 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,