From 82cf412da8e38a57bbbb79c71e79860a30c2a5f1 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Mon, 7 Sep 2009 15:20:24 +0200 Subject: [PATCH] Problem with extern extern in header * include/libxml/globals.h: LIBXML_DLL_IMPORT should not be followed by extern * include/libxml/xmlmemory.h: fix the same problem but in a comment --- include/libxml/globals.h | 2 +- include/libxml/xmlmemory.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/libxml/globals.h b/include/libxml/globals.h index e74e1b15..65b383a6 100644 --- a/include/libxml/globals.h +++ b/include/libxml/globals.h @@ -362,7 +362,7 @@ XMLPUBFUN void * * XMLCALL __xmlStructuredErrorContext(void); #define xmlStructuredErrorContext \ (*(__xmlStructuredErrorContext())) #else -LIBXML_DLL_IMPORT extern void * xmlStructuredErrorContext; +LIBXML_DLL_IMPORT void * xmlStructuredErrorContext; #endif XMLPUBFUN int * XMLCALL __xmlGetWarningsDefaultValue(void); diff --git a/include/libxml/xmlmemory.h b/include/libxml/xmlmemory.h index 8f3b1091..dcb8f3b7 100644 --- a/include/libxml/xmlmemory.h +++ b/include/libxml/xmlmemory.h @@ -88,11 +88,11 @@ typedef char *(XMLCALL *xmlStrdupFunc)(const char *str); /* * The 4 interfaces used for all memory handling within libxml. -LIBXML_DLL_IMPORT extern xmlFreeFunc xmlFree; -LIBXML_DLL_IMPORT extern xmlMallocFunc xmlMalloc; -LIBXML_DLL_IMPORT extern xmlMallocFunc xmlMallocAtomic; -LIBXML_DLL_IMPORT extern xmlReallocFunc xmlRealloc; -LIBXML_DLL_IMPORT extern xmlStrdupFunc xmlMemStrdup; +LIBXML_DLL_IMPORT xmlFreeFunc xmlFree; +LIBXML_DLL_IMPORT xmlMallocFunc xmlMalloc; +LIBXML_DLL_IMPORT xmlMallocFunc xmlMallocAtomic; +LIBXML_DLL_IMPORT xmlReallocFunc xmlRealloc; +LIBXML_DLL_IMPORT xmlStrdupFunc xmlMemStrdup; */ /*