File tree 3 files changed +13
-4
lines changed
3 files changed +13
-4
lines changed Original file line number Diff line number Diff line change 7
7
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
8
8
* Portions Copyright (c) 1994, Regents of the University of California
9
9
*
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 $
11
11
*
12
12
*-------------------------------------------------------------------------
13
13
*/
@@ -335,7 +335,7 @@ typedef struct Node
335
335
* Fortunately, this macro isn't recursive so we just define
336
336
* a global variable for this purpose.
337
337
*/
338
- extern Node * newNodeMacroHolder ;
338
+ extern DLLIMPORT Node * newNodeMacroHolder ;
339
339
340
340
#define newNode (size , tag ) \
341
341
( \
Original file line number Diff line number Diff line change 2
2
#
3
3
# Makefile for the pltcl shared object
4
4
#
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 $
6
6
#
7
7
# -------------------------------------------------------------------------
8
8
29
29
endif
30
30
31
31
32
+ ifneq ($(PORTNAME ) , win32)
32
33
SHLIB_LINK = $(BE_DLLLIBS ) $(TCL_LIB_SPEC ) $(TCL_LIBS ) -lc
34
+ else
35
+ SHLIB_LINK = $(TCL_LIB_SPEC ) $(BE_DLLLIBS )
36
+ endif
33
37
34
38
NAME = pltcl
35
39
SO_MAJOR_VERSION = 2
Original file line number Diff line number Diff line change 31
31
* ENHANCEMENTS, OR MODIFICATIONS.
32
32
*
33
33
* 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 $
35
35
*
36
36
**********************************************************************/
37
37
@@ -233,6 +233,11 @@ pltcl_init(void)
233
233
if (pltcl_pm_init_done )
234
234
return ;
235
235
236
+ #ifdef WIN32
237
+ /* Required on win32 to prevent error loading init.tcl */
238
+ Tcl_FindExecutable ("" );
239
+ #endif
240
+
236
241
/************************************************************
237
242
* Create the dummy hold interpreter to prevent close of
238
243
* stdout and stderr on DeleteInterp
You can’t perform that action at this time.
0 commit comments