Only in domc/: libdomc.a Only in domc/: libdomc.so.0.8.0 diff -r -U3 domc-0.8.0/Makefile domc/Makefile --- domc-0.8.0/Makefile 2004-09-09 16:31:42.000000000 -0600 +++ domc/Makefile 2004-12-02 10:27:01.085453866 -0700 @@ -1,7 +1,8 @@ -prefix = /usr/local -includedir = $(prefix)/include -libdir = $(prefix)/lib -mandir = $(prefix)/man +_EXTRA = -I../libmba/src/ -L../libmba/ +prefix = ./ +includedir = $(prefix) +libdir = $(prefix) +mandir = $(prefix) CC = gcc LIBNAME = domc MAJVERSION = 0.8 @@ -11,7 +12,7 @@ SOVERSION = lib$(LIBNAME).so.$(MAJVERSION) DISTRO = $(LIBNAME)-$(MINVERSION) RPM_OPT_FLAGS = -O2 -CFLAGS = -Wall -W -g -DMSGNO $(RPM_OPT_FLAGS) -I$(includedir) -L$(libdir) +CFLAGS = -Wall -W -g -DMSGNO $(RPM_OPT_FLAGS) $(_EXTRA) -I$(includedir) -L$(libdir) #CFLAGS = -Wall -W -DMSGNO -I$(includedir) -L$(libdir) $(RPM_OPT_FLAGS) -ansi -pedantic -Wbad-function-cast -Wcast-align -Wcast-qual -Wchar-subscripts -Winline -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings -Wtraditional -Wconversion -Waggregate-return -Wno-parentheses OBJS = src/expatls.o src/events.o src/node.o src/nodelist.o src/namednodemap.o src/dom.o src/timestamp.o src/wcwidth.o src/mbs.o MAN = DOM_CharacterData.3m.gz DOM_Document.3m.gz DOM_Element.3m.gz DOM_Implementation.3m.gz DOM_NamedNodeMap.3m.gz DOM_Node.3m.gz DOM_NodeList.3m.gz DOM_Text.3m.gz @@ -19,7 +20,7 @@ all: $(ARNAME)($(OBJS)) $(SONAME) src/defines.h $(SONAME): $(OBJS) - $(CC) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME) + $(CC) -shared $(OBJS) $(_EXTRA) -L$(libdir) -lmba -Wl,-h,$(SOVERSION) -o $(SONAME) .c.a: $(CC) $(CFLAGS) -c -o $*.o $< @@ -47,5 +48,5 @@ clean: rm -f $(OBJS) $(ARNAME) $(SONAME) $(includedir)/domc.h $(libdir)/$(ARNAME) $(libdir)/$(SONAME) $(libdir)/$(SOVERSION) $(libdir)/lib$(LIBNAME).so $(DISTRO).zip - cd $(mandir)/man3 && rm -f $(MAN) + # cd $(mandir)/man3 && rm -f $(MAN) diff -r -U3 domc-0.8.0/Makefile.msvc domc/Makefile.msvc --- domc-0.8.0/Makefile.msvc 2004-08-04 17:20:02.000000000 -0600 +++ domc/Makefile.msvc 2004-12-02 10:27:01.086453660 -0700 @@ -1,22 +1,29 @@ !include -LIBMBA=..\libmba-0.8.9 -EXPAT=..\Expat-1.95.5 +LIBMBA=..\libmba +# EXPAT=..\Expat-1.95.5 # For i18n support in domc the encdec library is required. # Specify were the encdec library is below, change HAVE_ENCDEC to 1 # in src\defines.h and add /LIBPATH:$(ENCDEC) encdec.lib to the # .dll link command. -ENCDEC=..\encdec-0.3.7 +# ENCDEC=..\encdec-0.3.7 OBJS=src\expatls.obj src\events.obj src\timestamp.obj src\dom.obj src\node.obj src\namednodemap.obj src\nodelist.obj src\wcwidth.obj +# Debug flags +# CFLAGS=$(cflags) /MLd /GZ /Gm /ZI /Od /D_DEBUG -domc.dll: $(OBJS) - $(link) /INCREMENTAL:NO /NOLOGO /LIBPATH:$(EXPAT)\Libs /LIBPATH:$(LIBMBA) /LIBPATH:$(ENCDEC) libexpat.lib libmba.lib encdec.lib /DEF:domc.def /OUT:domc.dll -entry:_DllMainCRTStartup@12 -dll $(OBJS) +# Normal Flags +CFLAGS=$(cflags) /ML /DLIBMBA_API=extern /DDOMC_API=extern + +all: domc.lib + +# domc.dll: $(OBJS) +# $(link) /INCREMENTAL:NO /NOLOGO /LIBPATH:$(EXPAT)\Libs /LIBPATH:$(LIBMBA) /LIBPATH:$(ENCDEC) libexpat.lib libmba.lib encdec.lib /DEF:domc.def /OUT:domc.dll -entry:_DllMainCRTStartup@12 -dll $(OBJS) domc.lib: $(OBJS) $(implib) -machine:$(CPU) -out:domc.lib $(OBJS) .c.obj: - $(cc) $(cflags) /I$(EXPAT)\Source\lib /I$(ENCDEC)\src /I$(LIBMBA)\src /Fo$@ $*.c + $(cc) $(CFLAGS) /I$(LIBMBA)\src /Fo$@ $*.c clean: del domc.dll domc.lib domc.exp $(OBJS) diff -r -U3 domc-0.8.0/src/defines.h domc/src/defines.h --- domc-0.8.0/src/defines.h 2003-03-22 16:35:36.000000000 -0700 +++ domc/src/defines.h 2004-12-02 10:27:01.086453660 -0700 @@ -7,7 +7,7 @@ #define HAVE_ENCDEC 0 #define HAVE_STRDUP 1 #define HAVE_STRNLEN 0 -#define HAVE_EXPAT 195 +#define HAVE_EXPAT 0 #define HAVE_MBSTATE 0 #define HAVE_WCWIDTH 1 #define HAVE_SNPRINTF 1 @@ -21,7 +21,7 @@ #define HAVE_ENCDEC 0 #define HAVE_STRDUP 1 #define HAVE_STRNLEN 0 -#define HAVE_EXPAT 195 +#define HAVE_EXPAT 0 #define HAVE_MBSTATE 0 #define HAVE_WCWIDTH 0 #define HAVE_SNPRINTF 0 @@ -35,7 +35,7 @@ #define HAVE_ENCDEC 0 #define HAVE_STRDUP 1 #define HAVE_STRNLEN 1 -#define HAVE_EXPAT 195 +#define HAVE_EXPAT 0 #define HAVE_MBSTATE 1 #define HAVE_WCWIDTH 1 #define HAVE_SNPRINTF 1 diff -r -U3 domc-0.8.0/src/domc.h domc/src/domc.h --- domc-0.8.0/src/domc.h 2004-09-09 15:52:10.000000000 -0600 +++ domc/src/domc.h 2004-12-02 10:29:08.870136502 -0700 @@ -192,6 +192,8 @@ DOM_String *data; } ProcessingInstruction; } u; + unsigned int rtfxRefCount; /* Reference counting added for RTFX */ + void* userData; /* User data added for RTFX */ }; DOM_Node *DOM_Node_insertBefore(DOM_Node *node, DOM_Node *newChild, DOM_Node *refChild); @@ -222,6 +224,7 @@ #if FAST_NODELIST struct hashmap* _map; #endif + unsigned int rtfxRefCount; /* Reference counting added for RTFX */ }; DOM_Node *DOM_NodeList_item(const DOM_NodeList *nl, int index); @@ -296,8 +299,10 @@ * described in the latest W3C drafts at all. */ +#if HAVE_EXPAT > 0 int DOM_DocumentLS_load(DOM_DocumentLS *this, const char *uri); int DOM_DocumentLS_fread(DOM_DocumentLS *this, FILE *stream); +#endif int DOM_DocumentLS_save(DOM_DocumentLS *this, const char *uri, const DOM_Node *node); int DOM_DocumentLS_fwrite(const DOM_DocumentLS *this, FILE *stream); Only in domc/src: dom.o Only in domc/src: events.o diff -r -U3 domc-0.8.0/src/expatls.c domc/src/expatls.c --- domc-0.8.0/src/expatls.c 2004-09-09 16:08:26.000000000 -0600 +++ domc/src/expatls.c 2004-12-02 10:27:01.087453455 -0700 @@ -724,7 +724,7 @@ fputs(">", stream); break; case '&': - fputs("'", stream); + fputs("&", stream); break; case '"': fputs(""", stream); @@ -848,11 +848,6 @@ fputs(" version=\"", stream); fputds(node->u.Document.version ? node->u.Document.version : "1.0", stream); fputc('\"', stream); -#ifdef CODESET - fputs(" encoding=\"", stream); - fputs(nl_langinfo(CODESET), stream); - fputc('\"', stream); -#endif if (node->u.Document.standalone != 0) { fputs(" standalone=\"yes\"", stream); } Only in domc/src: expatls.o Only in domc/src: mbs.o Only in domc/src: namednodemap.o Only in domc/src: nodelist.o Only in domc/src: node.o Only in domc/src: timestamp.o Only in domc/src: wcwidth.o