Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 296fb57

Browse files
committed
Make pltcl work on Win32. Magnus Hagander
1 parent 65ff0ed commit 296fb57

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

src/include/nodes/nodes.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.160 2004/08/29 04:13:07 momjian Exp $
10+
* $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.161 2004/09/14 03:21:25 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -335,7 +335,7 @@ typedef struct Node
335335
* Fortunately, this macro isn't recursive so we just define
336336
* a global variable for this purpose.
337337
*/
338-
extern Node *newNodeMacroHolder;
338+
extern DLLIMPORT Node *newNodeMacroHolder;
339339

340340
#define newNode(size, tag) \
341341
( \

src/pl/tcl/Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Makefile for the pltcl shared object
44
#
5-
# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.42 2004/01/21 19:04:11 tgl Exp $
5+
# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.43 2004/09/14 03:21:27 tgl Exp $
66
#
77
#-------------------------------------------------------------------------
88

@@ -29,7 +29,11 @@ endif
2929
endif
3030

3131

32+
ifneq ($(PORTNAME), win32)
3233
SHLIB_LINK = $(BE_DLLLIBS) $(TCL_LIB_SPEC) $(TCL_LIBS) -lc
34+
else
35+
SHLIB_LINK = $(TCL_LIB_SPEC) $(BE_DLLLIBS)
36+
endif
3337

3438
NAME = pltcl
3539
SO_MAJOR_VERSION = 2

src/pl/tcl/pltcl.c

+6-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* ENHANCEMENTS, OR MODIFICATIONS.
3232
*
3333
* IDENTIFICATION
34-
* $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.92 2004/09/13 20:09:39 tgl Exp $
34+
* $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.93 2004/09/14 03:21:27 tgl Exp $
3535
*
3636
**********************************************************************/
3737

@@ -233,6 +233,11 @@ pltcl_init(void)
233233
if (pltcl_pm_init_done)
234234
return;
235235

236+
#ifdef WIN32
237+
/* Required on win32 to prevent error loading init.tcl */
238+
Tcl_FindExecutable("");
239+
#endif
240+
236241
/************************************************************
237242
* Create the dummy hold interpreter to prevent close of
238243
* stdout and stderr on DeleteInterp

0 commit comments

Comments
 (0)