[PATCH 3/6] Remove deprecated atoms.

Arnaud Fontaine arnau at debian.org
Sat Sep 4 09:18:02 PDT 2010


Atoms defined in this library has been moved to xproto and marked as
deprecated almost one year ago.
---
 atom/atoms.gperf.m4 |    3 ---
 atom/xcb_atom.h.m4  |   13 -------------
 2 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/atom/atoms.gperf.m4 b/atom/atoms.gperf.m4
index d26814e..190e395 100644
--- a/atom/atoms.gperf.m4
+++ b/atom/atoms.gperf.m4
@@ -12,9 +12,6 @@
 #include <stdarg.h>
 #include "xcb_atom.h"
 
-define(`COUNT', 0)dnl
-define(`DO', `const xcb_atom_t $1 = define(`COUNT', incr(COUNT))COUNT;')dnl
-include(atomlist.m4)`'dnl
 %}
 
 %readonly-tables
diff --git a/atom/xcb_atom.h.m4 b/atom/xcb_atom.h.m4
index 0eb57d2..ce1473e 100644
--- a/atom/xcb_atom.h.m4
+++ b/atom/xcb_atom.h.m4
@@ -40,19 +40,6 @@ char *xcb_atom_name_by_screen(const char *base, uint8_t screen);
 char *xcb_atom_name_by_resource(const char *base, uint32_t resource);
 char *xcb_atom_name_unique(const char *base, uint32_t id);
 
-#ifndef X_DEPRECATED
-#ifdef __GNUC__
-#define X_DEPRECATED __attribute__((deprecated))
-#else
-#define X_DEPRECATED
-#endif
-#endif
-
-/* These constants are deprecated in favour of XCB_ATOM_*
-   from xproto.h */
-define(`DO', `extern const xcb_atom_t $1 X_DEPRECATED;')dnl
-include(atomlist.m4)`'dnl
-
 #ifdef __cplusplus
 }
 #endif
-- 
1.7.2.3


--=-=-=
Content-Type: text/x-diff
Content-Disposition: attachment;
 filename=0004-Remove-synchronous-xcb_atom_get.patch



More information about the Xcb mailing list