Skip to content

Commit

Permalink
Merge pull request #38 from tid-kijyun/fix/issue37
Browse files Browse the repository at this point in the history
Fixed error Xcode7.1 with cocoapods
  • Loading branch information
tid-kijyun committed Oct 22, 2015
2 parents c27687c + 4d365e8 commit 8f09af2
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 26 deletions.
6 changes: 3 additions & 3 deletions Library/libxml/HTMLtree.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#define __HTML_TREE_H__

#include <stdio.h>
#include <Kanna/xmlversion.h>
#include <Kanna/tree.h>
#include <Kanna/HTMLparser.h>
#include "xmlversion.h"
#include "tree.h"
#include "HTMLparser.h"

#ifdef LIBXML_HTML_ENABLED

Expand Down
2 changes: 1 addition & 1 deletion Library/libxml/SAX.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <stdlib.h>
#include <Kanna/xmlversion.h>
#include <Kanna/parser.h>
#include <Kanna/xlink.h>
#include "xlink.h"

#ifdef LIBXML_LEGACY_ENABLED

Expand Down
8 changes: 4 additions & 4 deletions Library/libxml/globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
#define __XML_GLOBALS_H

#include <Kanna/xmlversion.h>
#include <Kanna/parser.h>
#include <Kanna/xmlerror.h>
#include <Kanna/SAX.h>
#include <Kanna/SAX2.h>
#include "parser.h"
#include "xmlerror.h"
#include "SAX.h"
#include "SAX2.h"
#include <Kanna/xmlmemory.h>

#ifdef __cplusplus
Expand Down
12 changes: 6 additions & 6 deletions Library/libxml/parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
#include <Kanna/xmlversion.h>
#include <Kanna/tree.h>
#include <Kanna/dict.h>
#include <Kanna/hash.h>
#include <Kanna/valid.h>
#include <Kanna/entities.h>
#include <Kanna/xmlerror.h>
#include "hash.h"
#include "valid.h"
#include "entities.h"
#include "xmlerror.h"
#include <Kanna/xmlstring.h>

#ifdef __cplusplus
Expand Down Expand Up @@ -807,8 +807,8 @@ typedef xmlParserInputPtr (*xmlExternalEntityLoader) (const char *URL,
}
#endif

#include <Kanna/encoding.h>
#include <Kanna/xmlIO.h>
#include "encoding.h"
#include "xmlIO.h"
#include <Kanna/globals.h>

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion Library/libxml/threads.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ typedef xmlRMutex *xmlRMutexPtr;
#ifdef __cplusplus
}
#endif
#include <Kanna/globals.h>
#include "globals.h"
#ifdef __cplusplus
extern "C" {
#endif
Expand Down
8 changes: 4 additions & 4 deletions Library/libxml/tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#include <stdio.h>
#include <limits.h>
#include <Kanna/xmlversion.h>
#include <Kanna/xmlstring.h>
#include "xmlversion.h"
#include "xmlstring.h"

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -329,7 +329,7 @@ typedef enum {
#ifdef __cplusplus
}
#endif
#include <Kanna/xmlregexp.h>
#include "xmlregexp.h"
#ifdef __cplusplus
extern "C" {
#endif
Expand Down Expand Up @@ -1296,7 +1296,7 @@ XMLPUBFUN xmlNodePtr XMLCALL
}
#endif
#ifndef __XML_PARSER_H__
#include <Kanna/xmlmemory.h>
#include "xmlmemory.h"
#endif

#endif /* __XML_TREE_H__ */
Expand Down
6 changes: 3 additions & 3 deletions Library/libxml/valid.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#define __XML_VALID_H__

#include <Kanna/xmlversion.h>
#include <Kanna/xmlerror.h>
#include "xmlerror.h"
#include <Kanna/tree.h>
#include <Kanna/list.h>
#include <Kanna/xmlautomata.h>
#include "list.h"
#include "xmlautomata.h"
#include <Kanna/xmlregexp.h>

#ifdef __cplusplus
Expand Down
4 changes: 2 additions & 2 deletions Library/libxml/xmlmemory.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ XMLPUBFUN char * XMLCALL

#ifndef __XML_GLOBALS_H
#ifndef __XML_THREADS_H__
#include <Kanna/threads.h>
#include <Kanna/globals.h>
#include "threads.h"
#include "globals.h"
#endif
#endif

Expand Down
2 changes: 1 addition & 1 deletion Library/libxml/xmlregexp.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ typedef xmlRegExecCtxt *xmlRegExecCtxtPtr;
}
#endif
#include <Kanna/tree.h>
#include <Kanna/dict.h>
#include "dict.h"
#ifdef __cplusplus
extern "C" {
#endif
Expand Down
2 changes: 1 addition & 1 deletion Library/libxml/xmlversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#ifndef __XML_VERSION_H__
#define __XML_VERSION_H__

#include <Kanna/xmlexports.h>
#include "xmlexports.h"

#ifdef __cplusplus
extern "C" {
Expand Down

0 comments on commit 8f09af2

Please sign in to comment.