diff options
| author | Patrick Monnerat <patrick.monnerat@dh.com> | 2016-05-02 16:21:47 +0200 |
|---|---|---|
| committer | Daniel Veillard <veillard@redhat.com> | 2016-05-03 13:52:00 +0800 |
| commit | c71f9305a99b6aa03cb08fab31106c9c56f1be4f (patch) | |
| tree | 7654ea441022a211ddfa73214a52468849c7e1b9 | |
| parent | f6599c5164800e9b6fe8a85e6e2bc54fdf2f952a (diff) | |
| download | libxml2-c71f9305a99b6aa03cb08fab31106c9c56f1be4f.tar.gz | |
dict.h: Move xmlDictPtr definition before includes to allow direct inclusion.
| -rw-r--r-- | include/libxml/dict.h | 18 | ||||
| -rw-r--r-- | os400/libxmlrpg/dict.rpgle | 8 |
2 files changed, 16 insertions, 10 deletions
diff --git a/include/libxml/dict.h b/include/libxml/dict.h index 3028b20f..b83db59a 100644 --- a/include/libxml/dict.h +++ b/include/libxml/dict.h @@ -11,6 +11,18 @@ #ifndef __XML_DICT_H__ #define __XML_DICT_H__ +#ifdef __cplusplus +#define __XML_EXTERNC extern "C" +#else +#define __XML_EXTERNC +#endif + +/* + * The dictionary. + */ +__XML_EXTERNC typedef struct _xmlDict xmlDict; +__XML_EXTERNC typedef xmlDict *xmlDictPtr; + #include <limits.h> #include <libxml/xmlversion.h> #include <libxml/tree.h> @@ -20,12 +32,6 @@ extern "C" { #endif /* - * The dictionary. - */ -typedef struct _xmlDict xmlDict; -typedef xmlDict *xmlDictPtr; - -/* * Initializer */ XMLPUBFUN int XMLCALL xmlInitializeDict(void); diff --git a/os400/libxmlrpg/dict.rpgle b/os400/libxmlrpg/dict.rpgle index d93c6ef3..c061e4c8 100644 --- a/os400/libxmlrpg/dict.rpgle +++ b/os400/libxmlrpg/dict.rpgle @@ -9,14 +9,14 @@ /if not defined(XML_DICT_H__) /define XML_DICT_H__ - /include "libxmlrpg/xmlversion" - /include "libxmlrpg/xmlTypesC" - /include "libxmlrpg/tree" - * The dictionary. d xmlDictPtr s * based(######typedef######) + /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/tree" + * Initializer d xmlInitializeDict... |