Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Do not use the included allocator even on windows.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | wip
Files: files | file ages | folders
SHA3-256: f5a1497f673b9f13bb1ab1954cae936125169707c5bd30ccb844e31ee77ba98e
User & Date: user 2024-07-07 21:31:18
Context
2024-07-08
00:41
More type massage and fixes. check-in: 85bc8c68e6 user: user tags: wip
2024-07-07
21:31
Do not use the included allocator even on windows. check-in: f5a1497f67 user: user tags: wip
00:03
wip check-in: 8da21506ea user: rolf tags: wip
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tclexpat.h.





1
2
3
4
5
6
7




#include <tcl.h>
#include <expat.h>
#include "dom.h"
#include "schema.h"

struct TclGenExpatInfo;

>
>
>
>







1
2
3
4
5
6
7
8
9
10
11

#ifndef __TCL_EXPAT_H__
#define __TCL_EXPAT_H__

#include <tcl.h>
#include <expat.h>
#include "dom.h"
#include "schema.h"

struct TclGenExpatInfo;

175
176
177
178
179
180
181

 			     char *handlerSetName);
void * CHandlerSetGetUserData (Tcl_Interp *interp,
                               Tcl_Obj *const expatObj,
 			      char *handlerSetName);

TclGenExpatInfo * GetExpatInfo (Tcl_Interp *interp,
				       Tcl_Obj *const expatObj);








>
179
180
181
182
183
184
185
186
 			     char *handlerSetName);
void * CHandlerSetGetUserData (Tcl_Interp *interp,
                               Tcl_Obj *const expatObj,
 			      char *handlerSetName);

TclGenExpatInfo * GetExpatInfo (Tcl_Interp *interp,
				       Tcl_Obj *const expatObj);
#endif 

Changes to generic/tdom.h.

1
2
3
4
5
6
7
8
9
10

11
12

#include "tcl.h"
#include <expat.h>
#include "tclexpat.h"

#ifdef BUILD_tdom
# undef TCL_STORAGE_CLASS
# define TCL_STORAGE_CLASS DLLEXPORT
#endif


#include "dom.h"
#include "tdomDecls.h"



<






>


1
2
3

4
5
6
7
8
9
10
11
12

#include "tcl.h"
#include <expat.h>


#ifdef BUILD_tdom
# undef TCL_STORAGE_CLASS
# define TCL_STORAGE_CLASS DLLEXPORT
#endif

#include "tclexpat.h"
#include "dom.h"
#include "tdomDecls.h"

Changes to win/makefile.vc.

26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
EXPATDIR = ..\expat
PRJ_OBJS = \
	$(TMP_DIR)\xmlrole.obj     \
	$(TMP_DIR)\xmltok.obj      \
	$(TMP_DIR)\xmlparse.obj    \
	$(TMP_DIR)\xmlsimple.obj   \
	$(TMP_DIR)\dom.obj         \
	$(TMP_DIR)\domalloc.obj    \
	$(TMP_DIR)\domhtml.obj     \
	$(TMP_DIR)\domhtml5.obj    \
	$(TMP_DIR)\domxslt.obj     \
	$(TMP_DIR)\nodecmd.obj     \
	$(TMP_DIR)\domxpath.obj    \
	$(TMP_DIR)\domlock.obj     \
	$(TMP_DIR)\domjson.obj     \







<







26
27
28
29
30
31
32

33
34
35
36
37
38
39
EXPATDIR = ..\expat
PRJ_OBJS = \
	$(TMP_DIR)\xmlrole.obj     \
	$(TMP_DIR)\xmltok.obj      \
	$(TMP_DIR)\xmlparse.obj    \
	$(TMP_DIR)\xmlsimple.obj   \
	$(TMP_DIR)\dom.obj         \

	$(TMP_DIR)\domhtml.obj     \
	$(TMP_DIR)\domhtml5.obj    \
	$(TMP_DIR)\domxslt.obj     \
	$(TMP_DIR)\nodecmd.obj     \
	$(TMP_DIR)\domxpath.obj    \
	$(TMP_DIR)\domlock.obj     \
	$(TMP_DIR)\domjson.obj     \
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
	$(TMP_DIR)\tdominit.obj

PRJ_STUBOBJS = $(TMP_DIR)\tdomStubLib.obj

PRJ_DEFINES = \
	-D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE \
	-DHAVE_MEMMOVE -DXML_DTD=1 -DXML_NS=1 -DTDOM_NO_UNKNOWN_CMD=1 \
	-DXML_GE=1 -DXML_CONTEXT_BYTES=0 \
	-DXMLIMPORT=__declspec(dllexport)

# TBD - some of the code, like expat checks for Windows using the
# WIN32 macro. This should really be changed to check _WIN32. For now,
# define WIN32 ourselves
PRJ_DEFINES = $(PRJ_DEFINES) -DWIN32








|







47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
	$(TMP_DIR)\tdominit.obj

PRJ_STUBOBJS = $(TMP_DIR)\tdomStubLib.obj

PRJ_DEFINES = \
	-D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE \
	-DHAVE_MEMMOVE -DXML_DTD=1 -DXML_NS=1 -DTDOM_NO_UNKNOWN_CMD=1 \
	-DXML_GE=1 -DXML_CONTEXT_BYTES=0 -DUSE_NORMAL_ALLOCATOR \
	-DXMLIMPORT=__declspec(dllexport)

# TBD - some of the code, like expat checks for Windows using the
# WIN32 macro. This should really be changed to check _WIN32. For now,
# define WIN32 ourselves
PRJ_DEFINES = $(PRJ_DEFINES) -DWIN32

Changes to win/pkgIndex.tcl.

1
2
3
4
5
6
7
8
9
10
11
12
#
# Tcl package index file
#
if {[package vsatisfies [package provide Tcl] 9.0-]} {
    package ifneeded tdom 0.9.4 \
        "[list load [file join $dir tcl9tdom094.dll]];
         [list source [file join $dir tdom.tcl]]"
} else {
    package ifneeded tdom 0.9.4\
        "[list load [file join $dir tdom094.dll]];
         [list source [file join $dir tdom.tcl]]"
}








|



1
2
3
4
5
6
7
8
9
10
11
12
#
# Tcl package index file
#
if {[package vsatisfies [package provide Tcl] 9.0-]} {
    package ifneeded tdom 0.9.4 \
        "[list load [file join $dir tcl9tdom094.dll]];
         [list source [file join $dir tdom.tcl]]"
} else {
    package ifneeded tdom 0.9.4 \
        "[list load [file join $dir tdom094.dll]];
         [list source [file join $dir tdom.tcl]]"
}