summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavygrvy <davygrvy@pobox.com>2004-01-15 22:20:38 (GMT)
committerdavygrvy <davygrvy@pobox.com>2004-01-15 22:20:38 (GMT)
commit1670aa41a074dca8bcb56402cb91c1970a588934 (patch)
treeeb1de93edebc79dde8f9d4b03f70942a9f5dc83f
parent9b53208dd029316e18144d8dc5f6973169e1912a (diff)
downloadtcl-1670aa41a074dca8bcb56402cb91c1970a588934.zip
tcl-1670aa41a074dca8bcb56402cb91c1970a588934.tar.gz
tcl-1670aa41a074dca8bcb56402cb91c1970a588934.tar.bz2
* win/tclWinReg.c: Placed the requirement for advapi.lib
into the object file itself with #paragma comment (lib, ...) when built with VC++. This will simplify linking for users of the static library. * win/makefile.vc: Removed 'advapi.lib' from $(baselibs).
-rw-r--r--win/makefile.vc4
-rw-r--r--win/tclWinReg.c7
2 files changed, 7 insertions, 4 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index fa2bc52..86f481f 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2002 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.115 2004/01/10 00:24:55 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.116 2004/01/15 22:20:38 davygrvy Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -421,7 +421,7 @@ dlllflags = $(lflags) -dll
conlflags = $(lflags) -subsystem:console
guilflags = $(lflags) -subsystem:windows
-baselibs = kernel32.lib advapi32.lib user32.lib
+baselibs = kernel32.lib user32.lib
#---------------------------------------------------------------------
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 4a2c841..32aa940 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -11,10 +11,13 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinReg.c,v 1.24 2003/11/10 22:55:48 dgp Exp $
+ * RCS: @(#) $Id: tclWinReg.c,v 1.25 2004/01/15 22:20:38 davygrvy Exp $
*/
#include <tclPort.h>
+#ifdef _MSC_VER
+# pragma comment (lib, "advapi32.lib")
+#endif
#include <stdlib.h>
/*
@@ -212,7 +215,7 @@ int
Registry_Init(
Tcl_Interp *interp)
{
- if (!Tcl_InitStubs(interp, "8.0", 0)) {
+ if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
return TCL_ERROR;
}