--- misc/expat-2.1.0/lib/makefile.mk Wed Aug 20 14:33:55 2008 +++ misc/build/expat-2.1.0/lib/makefile.mk Wed Aug 20 14:26:42 2008 @@ -1 +1,90 @@ -dummy +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* +PRJ=../../../../.. + +PRJNAME=expat +TARGET=expat +LIBTARGET=NO +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE +VISIBILITY_HIDDEN=TRUE + +# --- Settings ----------------------------------------------------- +.INCLUDE : settings.mk +# --- Files -------------------------------------------------------- + +CFLAGS+=-I.. + +.IF "$(OS)"=="WNT" +CDEFS+=-DCOMPILED_FROM_DSP +.ELSE +CDEFS+=-DHAVE_EXPAT_CONFIG_H +.ENDIF + +.IF "$(OS)"=="MACOSX" && "$(SYSBASE)"!="" +CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY +.ENDIF # "$(OS)"=="MACOSX" + +SLOFILES=$(SLO)/xmlparse.obj \ + $(SLO)/xmlrole.obj \ + $(SLO)/xmltok.obj + +SECOND_BUILD=UNICODE +UNICODE_SLOFILES=$(SLO)/xmlparse.obj +UNICODECDEFS+=-DXML_UNICODE + +LIB1ARCHIV=$(LB)/libascii_$(TARGET)_xmlparse.a +LIB1TARGET=$(SLB)/ascii_$(TARGET)_xmlparse.lib +LIB1OBJFILES=$(SLO)/xmlparse.obj + +LIB2ARCHIV=$(LB)/lib$(TARGET)_xmlparse.a +LIB2TARGET=$(SLB)/$(TARGET)_xmlparse.lib +LIB2OBJFILES =$(REAL_UNICODE_SLOFILES) + +LIB3ARCHIV=$(LB)/lib$(TARGET)_xmltok.a +LIB3TARGET=$(SLB)/$(TARGET)_xmltok.lib +LIB3OBJFILES=$(SLO)/xmlrole.obj $(SLO)/xmltok.obj + +.IF "$(BUILD_X64)"!="" +# ---------------- X64 stuff special --------------------- +# use UNICODE only because shell/shlxthandler +# doesn't link against ascii_expat_xmlparse +#--------------------------------------------------------- +SLOFILES_X64=$(SLO_X64)/xmlparse.obj \ + $(SLO_X64)/xmlrole.obj \ + $(SLO_X64)/xmltok.obj +CDEFS_X64+=-DXML_UNICODE -DCOMPILED_FROM_DSP +CFLAGS_X64+=-I.. +LIB1TARGET_X64=$(SLB_X64)/$(TARGET)_xmlparse.lib +LIB1OBJFILES_X64=$(SLO_X64)/xmlparse.obj +LIB2TARGET_X64=$(SLB_X64)/$(TARGET)_xmltok.lib +LIB2OBJFILES_X64=$(SLO_X64)/xmlrole.obj $(SLO_X64)/xmltok.obj +.ENDIF # "$(BUILD_X64)"!="" + +# --- Targets ------------------------------------------------------ +.INCLUDE : set_wntx64.mk +.INCLUDE : target.mk +.INCLUDE : tg_wntx64.mk --- misc/expat-2.1.0/lib/expat_external.h +++ misc/build/expat-2.1.0/lib/expat_external.h @@ -86,9 +86,11 @@ typedef unsigned short XML_Char; typedef char XML_LChar; #endif /* XML_UNICODE_WCHAR_T */ +#define EXPAT_CHARTYPE_DECORATE(s) s##_UTF16 #else /* Information is UTF-8 encoded. */ typedef char XML_Char; typedef char XML_LChar; +#define EXPAT_CHARTYPE_DECORATE(s) s##_UTF8 #endif /* XML_UNICODE */ #ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */ --- misc/expat-2.1.0/lib/expat.h +++ misc/build/expat-2.1.0/lib/expat.h @@ -15,6 +15,73 @@ #include #include "expat_external.h" +#define XML_DefaultCurrent EXPAT_CHARTYPE_DECORATE(XML_DefaultCurrent) +#define XML_ErrorString EXPAT_CHARTYPE_DECORATE(XML_ErrorString) +#define XML_ExpatVersion EXPAT_CHARTYPE_DECORATE(XML_ExpatVersion) +#define XML_ExpatVersionInfo EXPAT_CHARTYPE_DECORATE(XML_ExpatVersionInfo) +#define XML_ExternalEntityParserCreate EXPAT_CHARTYPE_DECORATE(XML_ExternalEntityParserCreate) +#define XML_FreeContentModel EXPAT_CHARTYPE_DECORATE(XML_FreeContentModel) +#define XML_GetBase EXPAT_CHARTYPE_DECORATE(XML_GetBase) +#define XML_GetBuffer EXPAT_CHARTYPE_DECORATE(XML_GetBuffer) +#define XML_GetCurrentByteCount EXPAT_CHARTYPE_DECORATE(XML_GetCurrentByteCount) +#define XML_GetCurrentByteIndex EXPAT_CHARTYPE_DECORATE(XML_GetCurrentByteIndex) +#define XML_GetCurrentColumnNumber EXPAT_CHARTYPE_DECORATE(XML_GetCurrentColumnNumber) +#define XML_GetCurrentLineNumber EXPAT_CHARTYPE_DECORATE(XML_GetCurrentLineNumber) +#define XML_GetErrorCode EXPAT_CHARTYPE_DECORATE(XML_GetErrorCode) +#define XML_GetFeatureList EXPAT_CHARTYPE_DECORATE(XML_GetFeatureList) +#define XML_GetIdAttributeIndex EXPAT_CHARTYPE_DECORATE(XML_GetIdAttributeIndex) +#define XML_GetInputContext EXPAT_CHARTYPE_DECORATE(XML_GetInputContext) +#define XML_GetParsingStatus EXPAT_CHARTYPE_DECORATE(XML_GetParsingStatus) +#define XML_GetSpecifiedAttributeCount EXPAT_CHARTYPE_DECORATE(XML_GetSpecifiedAttributeCount) +#define XML_MemFree EXPAT_CHARTYPE_DECORATE(XML_MemFree) +#define XML_MemMalloc EXPAT_CHARTYPE_DECORATE(XML_MemMalloc) +#define XML_MemRealloc EXPAT_CHARTYPE_DECORATE(XML_MemRealloc) +#define XML_Parse EXPAT_CHARTYPE_DECORATE(XML_Parse) +#define XML_ParseBuffer EXPAT_CHARTYPE_DECORATE(XML_ParseBuffer) +#define XML_ParserCreate EXPAT_CHARTYPE_DECORATE(XML_ParserCreate) +#define XML_ParserCreateNS EXPAT_CHARTYPE_DECORATE(XML_ParserCreateNS) +#define XML_ParserCreate_MM EXPAT_CHARTYPE_DECORATE(XML_ParserCreate_MM) +#define XML_ParserFree EXPAT_CHARTYPE_DECORATE(XML_ParserFree) +#define XML_ParserReset EXPAT_CHARTYPE_DECORATE(XML_ParserReset) +#define XML_ResumeParser EXPAT_CHARTYPE_DECORATE(XML_ResumeParser) +#define XML_SetAttlistDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetAttlistDeclHandler) +#define XML_SetBase EXPAT_CHARTYPE_DECORATE(XML_SetBase) +#define XML_SetCdataSectionHandler EXPAT_CHARTYPE_DECORATE(XML_SetCdataSectionHandler) +#define XML_SetCharacterDataHandler EXPAT_CHARTYPE_DECORATE(XML_SetCharacterDataHandler) +#define XML_SetCommentHandler EXPAT_CHARTYPE_DECORATE(XML_SetCommentHandler) +#define XML_SetDefaultHandler EXPAT_CHARTYPE_DECORATE(XML_SetDefaultHandler) +#define XML_SetDefaultHandlerExpand EXPAT_CHARTYPE_DECORATE(XML_SetDefaultHandlerExpand) +#define XML_SetDoctypeDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetDoctypeDeclHandler) +#define XML_SetElementDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetElementDeclHandler) +#define XML_SetElementHandler EXPAT_CHARTYPE_DECORATE(XML_SetElementHandler) +#define XML_SetEncoding EXPAT_CHARTYPE_DECORATE(XML_SetEncoding) +#define XML_SetEndCdataSectionHandler EXPAT_CHARTYPE_DECORATE(XML_SetEndCdataSectionHandler) +#define XML_SetEndDoctypeDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetEndDoctypeDeclHandler) +#define XML_SetEndElementHandler EXPAT_CHARTYPE_DECORATE(XML_SetEndElementHandler) +#define XML_SetEndNamespaceDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetEndNamespaceDeclHandler) +#define XML_SetEntityDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetEntityDeclHandler) +#define XML_SetExternalEntityRefHandler EXPAT_CHARTYPE_DECORATE(XML_SetExternalEntityRefHandler) +#define XML_SetExternalEntityRefHandlerArg EXPAT_CHARTYPE_DECORATE(XML_SetExternalEntityRefHandlerArg) +#define XML_SetHashSalt EXPAT_CHARTYPE_DECORATE(XML_SetHashSalt) +#define XML_SetNamespaceDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetNamespaceDeclHandler) +#define XML_SetNotStandaloneHandler EXPAT_CHARTYPE_DECORATE(XML_SetNotStandaloneHandler) +#define XML_SetNotationDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetNotationDeclHandler) +#define XML_SetParamEntityParsing EXPAT_CHARTYPE_DECORATE(XML_SetParamEntityParsing) +#define XML_SetProcessingInstructionHandler EXPAT_CHARTYPE_DECORATE(XML_SetProcessingInstructionHandler) +#define XML_SetReturnNSTriplet EXPAT_CHARTYPE_DECORATE(XML_SetReturnNSTriplet) +#define XML_SetSkippedEntityHandler EXPAT_CHARTYPE_DECORATE(XML_SetSkippedEntityHandler) +#define XML_SetStartCdataSectionHandler EXPAT_CHARTYPE_DECORATE(XML_SetStartCdataSectionHandler) +#define XML_SetStartDoctypeDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetStartDoctypeDeclHandler) +#define XML_SetStartElementHandler EXPAT_CHARTYPE_DECORATE(XML_SetStartElementHandler) +#define XML_SetStartNamespaceDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetStartNamespaceDeclHandler) +#define XML_SetUnknownEncodingHandler EXPAT_CHARTYPE_DECORATE(XML_SetUnknownEncodingHandler) +#define XML_SetUnparsedEntityDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetUnparsedEntityDeclHandler) +#define XML_SetUserData EXPAT_CHARTYPE_DECORATE(XML_SetUserData) +#define XML_SetXmlDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetXmlDeclHandler) +#define XML_StopParser EXPAT_CHARTYPE_DECORATE(XML_StopParser) +#define XML_UseForeignDTD EXPAT_CHARTYPE_DECORATE(XML_UseForeignDTD) +#define XML_UseParserAsHandlerArg EXPAT_CHARTYPE_DECORATE(XML_UseParserAsHandlerArg) + #ifdef __cplusplus extern "C" { #endif