diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2009-04-15 09:20:25 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2009-04-15 09:20:25 +0000 |
| commit | f076f348c4e7449f3f70b1e0f2137dccd0c2ba2e (patch) | |
| tree | e6fb4891ad7e2b5fb51c265f01241c8cd710d19a /include/libxml/xmlwin32version.h.in | |
| parent | 719f397e6f6f10311d7232339883096635d0a644 (diff) | |
| download | libxml2-f076f348c4e7449f3f70b1e0f2137dccd0c2ba2e.tar.gz | |
change ATTRIBUTE_PRINTF into LIBXML_ATTR_FORMAT to avoid macro name
* include/libxml/parser.h include/libxml/xmlwriter.h
include/libxml/relaxng.h include/libxml/xmlversion.h.in
include/libxml/xmlwin32version.h.in include/libxml/valid.h
include/libxml/xmlschemas.h include/libxml/xmlerror.h: change
ATTRIBUTE_PRINTF into LIBXML_ATTR_FORMAT to avoid macro name
collisions with other packages and headers as reported by
Belgabor and Mike Hommey
daniel
svn path=/trunk/; revision=3827
Diffstat (limited to 'include/libxml/xmlwin32version.h.in')
| -rw-r--r-- | include/libxml/xmlwin32version.h.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/libxml/xmlwin32version.h.in b/include/libxml/xmlwin32version.h.in index fbaf78bb..375f3a4e 100644 --- a/include/libxml/xmlwin32version.h.in +++ b/include/libxml/xmlwin32version.h.in @@ -274,24 +274,24 @@ extern void xmlCheckVersion(int version); #endif /** - * ATTRIBUTE_PRINTF: + * LIBXML_ATTR_FORMAT: * * Macro used to indicate to GCC the parameter are printf like */ -#ifndef ATTRIBUTE_PRINTF +#ifndef LIBXML_ATTR_FORMAT # if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) -# define ATTRIBUTE_PRINTF(fmt,args) __attribute__((__format__(__printf__,fmt,args))) +# define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args))) # else -# define ATTRIBUTE_PRINTF(fmt,args) +# define LIBXML_ATTR_FORMAT(fmt,args) # endif #else -# define ATTRIBUTE_PRINTF(fmt,args) +# define LIBXML_ATTR_FORMAT(fmt,args) #endif #else /* !__GNUC__ */ #define ATTRIBUTE_UNUSED -#define ATTRIBUTE_PRINTF(fmt,args) +#define LIBXML_ATTR_FORMAT(fmt,args) #define ATTRIBUTE_ALLOC_SIZE(x) #endif /* __GNUC__ */ |