Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add MOZ_ prefix to a few more symbols to avoid conflicts with system libexpat. Remove hashtable.c from build because it's unused. Bug 119934, r=darin, sr=dbaron, a=asa.

Browse Source
This commit is contained in:
bryner%brianryner.com 2003-12-05 20:17:03 +00:00
parent f673d84193
commit 1017625194
6 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
expat/xmlparse/Makefile.in
View File

@ -45,7 +45,6 @@ MODULE = expat
LIBRARY_NAME = expat_s
CSRCS = \
hashtable.c \
xmlparse.c \
$(NULL)

4
expat/xmltok/xmlrole.h
View File

@ -12,6 +12,10 @@ See the file COPYING for copying permission.
extern "C" {
#endif
/* avoid conflicts with system versions of libexpat */
#define XmlPrologStateInit MOZ_XmlPrologStateInit
#define XmlPrologStateInitExternalEntity MOZ_XmlPrologStateInitExternalEntity
enum {
XML_ROLE_ERROR = -1,
XML_ROLE_NONE = 0,

10
expat/xmltok/xmltok.h
View File

@ -14,6 +14,16 @@ extern "C" {
#define XMLTOKAPI /* as nothing */
#endif
/* avoid conflicts with system versions of libexpat */
#define XmlGetUtf16InternalEncoding MOZ_XmlGetUtf16InternalEncoding
#define XmlGetUtf8InternalEncoding MOZ_XmlGetUtf8InternalEncoding
#define XmlInitEncoding MOZ_XmlInitEncoding
#define XmlInitUnknownEncoding MOZ_XmlInitUnknownEncoding
#define XmlParseXmlDecl MOZ_XmlParseXmlDecl
#define XmlSizeOfUnknownEncoding MOZ_XmlSizeOfUnknownEncoding
#define XmlUtf16Encode MOZ_XmlUtf16Encode
#define XmlUtf8Encode MOZ_XmlUtf8Encode
/* The following token may be returned by XmlContentTok */
#define XML_TOK_TRAILING_RSQB -5 /* ] or ]] at the end of the scan; might be start of
illegal ]]> sequence */

1
parser/expat/lib/Makefile.in
View File

@ -45,7 +45,6 @@ MODULE = expat
LIBRARY_NAME = expat_s
CSRCS = \
hashtable.c \
xmlparse.c \
$(NULL)

4
parser/expat/lib/xmlrole.h
View File

@ -12,6 +12,10 @@ See the file COPYING for copying permission.
extern "C" {
#endif
/* avoid conflicts with system versions of libexpat */
#define XmlPrologStateInit MOZ_XmlPrologStateInit
#define XmlPrologStateInitExternalEntity MOZ_XmlPrologStateInitExternalEntity
enum {
XML_ROLE_ERROR = -1,
XML_ROLE_NONE = 0,

10
parser/expat/lib/xmltok.h
View File

@ -14,6 +14,16 @@ extern "C" {
#define XMLTOKAPI /* as nothing */
#endif
/* avoid conflicts with system versions of libexpat */
#define XmlGetUtf16InternalEncoding MOZ_XmlGetUtf16InternalEncoding
#define XmlGetUtf8InternalEncoding MOZ_XmlGetUtf8InternalEncoding
#define XmlInitEncoding MOZ_XmlInitEncoding
#define XmlInitUnknownEncoding MOZ_XmlInitUnknownEncoding
#define XmlParseXmlDecl MOZ_XmlParseXmlDecl
#define XmlSizeOfUnknownEncoding MOZ_XmlSizeOfUnknownEncoding
#define XmlUtf16Encode MOZ_XmlUtf16Encode
#define XmlUtf8Encode MOZ_XmlUtf8Encode
/* The following token may be returned by XmlContentTok */
#define XML_TOK_TRAILING_RSQB -5 /* ] or ]] at the end of the scan; might be start of
illegal ]]> sequence */