Skip to content
Snippets Groups Projects
Commit 296fb57b authored by Tom Lane's avatar Tom Lane
Browse files

Make pltcl work on Win32. Magnus Hagander

parent 65ff0ed4
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.160 2004/08/29 04:13:07 momjian Exp $ * $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.161 2004/09/14 03:21:25 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -335,7 +335,7 @@ typedef struct Node ...@@ -335,7 +335,7 @@ typedef struct Node
* Fortunately, this macro isn't recursive so we just define * Fortunately, this macro isn't recursive so we just define
* a global variable for this purpose. * a global variable for this purpose.
*/ */
extern Node *newNodeMacroHolder; extern DLLIMPORT Node *newNodeMacroHolder;
#define newNode(size, tag) \ #define newNode(size, tag) \
( \ ( \
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# Makefile for the pltcl shared object # Makefile for the pltcl shared object
# #
# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.42 2004/01/21 19:04:11 tgl Exp $ # $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.43 2004/09/14 03:21:27 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -29,7 +29,11 @@ endif ...@@ -29,7 +29,11 @@ endif
endif endif
ifneq ($(PORTNAME), win32)
SHLIB_LINK = $(BE_DLLLIBS) $(TCL_LIB_SPEC) $(TCL_LIBS) -lc SHLIB_LINK = $(BE_DLLLIBS) $(TCL_LIB_SPEC) $(TCL_LIBS) -lc
else
SHLIB_LINK = $(TCL_LIB_SPEC) $(BE_DLLLIBS)
endif
NAME = pltcl NAME = pltcl
SO_MAJOR_VERSION = 2 SO_MAJOR_VERSION = 2
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
* ENHANCEMENTS, OR MODIFICATIONS. * ENHANCEMENTS, OR MODIFICATIONS.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.92 2004/09/13 20:09:39 tgl Exp $ * $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.93 2004/09/14 03:21:27 tgl Exp $
* *
**********************************************************************/ **********************************************************************/
...@@ -233,6 +233,11 @@ pltcl_init(void) ...@@ -233,6 +233,11 @@ pltcl_init(void)
if (pltcl_pm_init_done) if (pltcl_pm_init_done)
return; return;
#ifdef WIN32
/* Required on win32 to prevent error loading init.tcl */
Tcl_FindExecutable("");
#endif
/************************************************************ /************************************************************
* Create the dummy hold interpreter to prevent close of * Create the dummy hold interpreter to prevent close of
* stdout and stderr on DeleteInterp * stdout and stderr on DeleteInterp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment