[Expat-checkins] CVS: expat/lib expat.dsp,NONE,1.1 winconfig.h,NONE,1.1 Makefile.in,1.6,1.7 expat.h,1.7,1.8 xmlparse.c,1.10,1.11 xmlrole.c,1.4,1.5 xmltok.c,1.4,1.5
Clark Cooper
coopercc@users.sourceforge.net
Sun, 22 Oct 2000 12:20:25 -0700
Update of /cvsroot/expat/expat/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv2478
Modified Files:
Makefile.in expat.h xmlparse.c xmlrole.c xmltok.c
Added Files:
expat.dsp winconfig.h
Log Message:
Changes for compiling under Microsoft Dev Studio.
--- NEW FILE ---
# Microsoft Developer Studio Project File - Name="expat" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=expat - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "expat.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "expat.mak" CFG="expat - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "expat - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "expat - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "expat - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /D "COMPILED_FROM_DSP" /Yu"stdafx.h" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
!ENDIF
# Begin Target
# Name "expat - Win32 Release"
# Name "expat - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\xmlparse.c
!IF "$(CFG)" == "expat - Win32 Release"
# ADD CPP /D VERSION="expat_1.95.1"
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
# ADD CPP /GX- /Od /D VERSION="\"expat_1.95.1\""
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\xmlrole.c
!IF "$(CFG)" == "expat - Win32 Release"
# ADD CPP /D VERSION=\"expat_1.95.1\"
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
# ADD CPP /D VERSION=\"expat_1.95.1\"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\xmltok.c
!IF "$(CFG)" == "expat - Win32 Release"
# ADD CPP /D VERSION=\"expat_1.95.1\"
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
# ADD CPP /D VERSION=\"expat_1.95.1\"
!ENDIF
# End Source File
# Begin Source File
SOURCE=xmltok_impl.c
!IF "$(CFG)" == "expat - Win32 Release"
# ADD CPP /D VERSION=\"expat_1.95.1\"
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D VERSION=\"expat_1.95.1\"
!ENDIF
# End Source File
# Begin Source File
SOURCE=xmltok_ns.c
!IF "$(CFG)" == "expat - Win32 Release"
# ADD CPP /D VERSION=\"expat_1.95.1\"
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D VERSION=\"expat_1.95.1\"
!ENDIF
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\ascii.h
# End Source File
# Begin Source File
SOURCE=.\asciitab.h
# End Source File
# Begin Source File
SOURCE=.\config.h
# End Source File
# Begin Source File
SOURCE=.\expat.h
# End Source File
# Begin Source File
SOURCE=.\iasciitab.h
# End Source File
# Begin Source File
SOURCE=.\latin1tab.h
# End Source File
# Begin Source File
SOURCE=.\nametab.h
# End Source File
# Begin Source File
SOURCE=.\utf8tab.h
# End Source File
# Begin Source File
SOURCE=.\xmlrole.h
# End Source File
# Begin Source File
SOURCE=.\xmltok.h
# End Source File
# Begin Source File
SOURCE=.\xmltok_impl.h
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# Begin Source File
SOURCE=.\ReadMe.txt
# End Source File
# End Target
# End Project
--- NEW FILE ---
/*================================================================
** Copyright 2000, Clark Cooper
** All rights reserved.
**
** This is free software. You are permitted to copy, distribute, or modify
** it under the terms of the MIT/X license (contained in the COPYING file
** with this distribution.)
**
**
*/
#ifndef WINCONFIG_H
#define WINCONFIG_H
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#include <memory.h>
#include <string.h>
#define XML_NS 1
#define XML_DTD 1
#define XML_BYTE_ORDER 12
#define XML_CONTEXT_BYTES 1024
#endif /* ndef WINCONFIG_H */
Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/lib/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile.in 2000/10/10 18:34:11 1.6
--- Makefile.in 2000/10/22 19:20:23 1.7
***************
*** 79,83 ****
INCLUDES = -I$(srcdir) -I..
! DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(VERSION)"'
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
--- 79,83 ----
INCLUDES = -I$(srcdir) -I..
! DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(PACKAGE)_$(VERSION)"'
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** expat.h 2000/10/20 15:37:28 1.7
--- expat.h 2000/10/22 19:20:23 1.8
***************
*** 654,658 ****
returns information about the error. */
! enum XML_Error XML_GetErrorCode(XML_Parser parser);
/* These functions return information about the current parse location.
--- 654,659 ----
returns information about the error. */
! enum XML_Error XMLPARSEAPI
! XML_GetErrorCode(XML_Parser parser);
/* These functions return information about the current parse location.
***************
*** 664,670 ****
of the sequence of characters that generated the event. */
! int XML_GetCurrentLineNumber(XML_Parser parser);
! int XML_GetCurrentColumnNumber(XML_Parser parser);
! long XML_GetCurrentByteIndex(XML_Parser parser);
/* Return the number of bytes in the current event.
--- 665,671 ----
of the sequence of characters that generated the event. */
! int XMLPARSEAPI XML_GetCurrentLineNumber(XML_Parser parser);
! int XMLPARSEAPI XML_GetCurrentColumnNumber(XML_Parser parser);
! long XMLPARSEAPI XML_GetCurrentByteIndex(XML_Parser parser);
/* Return the number of bytes in the current event.
Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** xmlparse.c 2000/10/20 15:37:28 1.10
--- xmlparse.c 2000/10/22 19:20:23 1.11
***************
*** 7,10 ****
--- 7,16 ----
= "$Header$";
+ #ifdef COMPILED_FROM_DSP
+ # include "winconfig.h"
+ # define XMLPARSEAPI __declspec(dllexport)
+ # include "expat.h"
+ # undef XMLPARSEAPI
+ #else
#include <config.h>
***************
*** 18,21 ****
--- 24,28 ----
# undef XMLPARSEAPI
#endif
+ #endif /* ndef COMPILED_FROM_DSP */
#include <stddef.h>
***************
*** 513,516 ****
--- 520,529 ----
#endif /* XML_DTD */
+ #ifdef COMPILED_FROM_DSP
+ BOOL WINAPI DllMain(HINSTANCE h, DWORD r, LPVOID p) {
+ return TRUE;
+ }
+ #endif /* def COMPILED_FROM_DSP */
+
#ifdef _MSC_VER
#ifdef _DEBUG
***************
*** 4555,4559 ****
}
else {
! int i, cn;
dest->numchildren = dtd.scaffold[src_node].childcnt;
dest->children = *contpos;
--- 4568,4573 ----
}
else {
! unsigned int i;
! int cn;
dest->numchildren = dtd.scaffold[src_node].childcnt;
dest->children = *contpos;
***************
*** 4571,4575 ****
build_model (XML_Parser parser)
{
- int node;
XML_Content *ret;
XML_Content *cpos;
--- 4585,4588 ----
Index: xmlrole.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** xmlrole.c 2000/09/29 14:57:45 1.4
--- xmlrole.c 2000/10/22 19:20:23 1.5
***************
*** 7,11 ****
= "$Header$";
! #include <config.h>
#include "xmlrole.h"
#include "ascii.h"
--- 7,16 ----
= "$Header$";
! #ifdef COMPILED_FROM_DSP
! # include "winconfig.h"
! #else
! # include <config.h>
! #endif /* ndef COMPILED_FROM_DSP */
!
#include "xmlrole.h"
#include "ascii.h"
Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** xmltok.c 2000/09/29 14:57:45 1.4
--- xmltok.c 2000/10/22 19:20:23 1.5
***************
*** 7,11 ****
= "$Header$";
! #include <config.h>
#include "xmltok.h"
#include "nametab.h"
--- 7,16 ----
= "$Header$";
! #ifdef COMPILED_FROM_DSP
! # include "winconfig.h"
! #else
! # include <config.h>
! #endif /* ndef COMPILED_FROM_DSP */
!
#include "xmltok.h"
#include "nametab.h"