lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-24 13:33:01 +03:00
Code Activity

594250 rename ATTRIBUTE_ALLOC_SIZE to avoid clashes

Browse Source 
* include/libxml/xmlmemory.h include/libxml/xmlversion.h.in: rename it
  to LIBXML_ATTR_ALLOC_SIZE to avoid conflicts in public headers
This commit is contained in:
Daniel Veillard
2009-09-09 18:57:26 +02:00
parent 848e5cf3ab
commit 57f71aed7d
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/libxml/xmlmemory.h
View File

@@ -63,7 +63,7 @@ typedef void (XMLCALL *xmlFreeFunc)(void *mem);
* *
* Returns a pointer to the newly allocated block or NULL in case of error. * Returns a pointer to the newly allocated block or NULL in case of error.
*/ */
typedef void *(ATTRIBUTE_ALLOC_SIZE(1) XMLCALL *xmlMallocFunc)(size_t size); typedef void *(LIBXML_ATTR_ALLOC_SIZE(1) XMLCALL *xmlMallocFunc)(size_t size);
/** /**
* xmlReallocFunc: * xmlReallocFunc:
@@ -150,7 +150,7 @@ XMLPUBFUN void XMLCALL
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlMemoryDump (void); xmlMemoryDump (void);
XMLPUBFUN void * XMLCALL XMLPUBFUN void * XMLCALL
xmlMemMalloc (size_t size) ATTRIBUTE_ALLOC_SIZE(1); xmlMemMalloc (size_t size) LIBXML_ATTR_ALLOC_SIZE(1);
XMLPUBFUN void * XMLCALL XMLPUBFUN void * XMLCALL
xmlMemRealloc (void *ptr,size_t size); xmlMemRealloc (void *ptr,size_t size);
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
@@ -158,11 +158,11 @@ XMLPUBFUN void XMLCALL
XMLPUBFUN char * XMLCALL XMLPUBFUN char * XMLCALL
xmlMemoryStrdup (const char *str); xmlMemoryStrdup (const char *str);
XMLPUBFUN void * XMLCALL XMLPUBFUN void * XMLCALL
xmlMallocLoc (size_t size, const char *file, int line) ATTRIBUTE_ALLOC_SIZE(1); xmlMallocLoc (size_t size, const char *file, int line) LIBXML_ATTR_ALLOC_SIZE(1);
XMLPUBFUN void * XMLCALL XMLPUBFUN void * XMLCALL
xmlReallocLoc (void *ptr, size_t size, const char *file, int line); xmlReallocLoc (void *ptr, size_t size, const char *file, int line);
XMLPUBFUN void * XMLCALL XMLPUBFUN void * XMLCALL
xmlMallocAtomicLoc (size_t size, const char *file, int line) ATTRIBUTE_ALLOC_SIZE(1); xmlMallocAtomicLoc (size_t size, const char *file, int line) LIBXML_ATTR_ALLOC_SIZE(1);
XMLPUBFUN char * XMLCALL XMLPUBFUN char * XMLCALL
xmlMemStrdupLoc (const char *str, const char *file, int line); xmlMemStrdupLoc (const char *str, const char *file, int line);

14
include/libxml/xmlversion.h.in
View File

@@ -398,19 +398,19 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
#endif #endif
/** /**
* ATTRIBUTE_ALLOC_SIZE: * LIBXML_ATTR_ALLOC_SIZE:
* *
* Macro used to indicate to GCC this is an allocator function * Macro used to indicate to GCC this is an allocator function
*/ */
#ifndef ATTRIBUTE_ALLOC_SIZE #ifndef LIBXML_ATTR_ALLOC_SIZE
# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) # if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
# define ATTRIBUTE_ALLOC_SIZE(x) __attribute__((alloc_size(x))) # define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
# else # else
# define ATTRIBUTE_ALLOC_SIZE(x) # define LIBXML_ATTR_ALLOC_SIZE(x)
# endif # endif
#else #else
# define ATTRIBUTE_ALLOC_SIZE(x) # define LIBXML_ATTR_ALLOC_SIZE(x)
#endif #endif
/** /**
@@ -437,11 +437,11 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
*/ */
#define ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED
/** /**
* ATTRIBUTE_ALLOC_SIZE: * LIBXML_ATTR_ALLOC_SIZE:
* *
* Macro used to indicate to GCC this is an allocator function * Macro used to indicate to GCC this is an allocator function
*/ */
#define ATTRIBUTE_ALLOC_SIZE(x) #define LIBXML_ATTR_ALLOC_SIZE(x)
/** /**
* LIBXML_ATTR_FORMAT: * LIBXML_ATTR_FORMAT:
* *