From 112a13277f76d6becc3d78934caae69bf2e63f9f Mon Sep 17 00:00:00 2001 From: nijtmans Date: Wed, 2 Jun 2010 08:22:15 +0000 Subject: remove some "BUILD_tcloo" leftovers --- ChangeLog | 8 +++++++- generic/tclOO.h | 9 +-------- win/makefile.bc | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d030c4..6054eca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -2010-06-101 Alexandre Ferrieux +2010-05-31 Jan Nijtmans + + * generic/tclOO.h BUILD_tcloo is never defined (leftover) + * win/makefile.bc Don't set BUILD_tcloo (leftover) + See also entry below: 2008-06-01 Joe Mistachkin + +2010-06-01 Alexandre Ferrieux * generic/tclNamesp.c: Fix computation of [uplevel] offsets in TIP 348. * tests/error.test: Only depend on callerPtr chaining now. diff --git a/generic/tclOO.h b/generic/tclOO.h index d97ec47..6dc0feb 100644 --- a/generic/tclOO.h +++ b/generic/tclOO.h @@ -9,20 +9,13 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclOO.h,v 1.10 2010/03/05 15:32:16 dkf Exp $ + * RCS: @(#) $Id: tclOO.h,v 1.11 2010/06/02 08:22:15 nijtmans Exp $ */ #ifndef TCLOO_H_INCLUDED #define TCLOO_H_INCLUDED #include "tcl.h" -#if defined(BUILD_tcloo) -# define TCLOOAPI DLLEXPORT -# undef USE_TCLOO_STUBS -#else -# define TCLOOAPI DLLIMPORT -#endif - /* * Be careful when it comes to versioning; need to make sure that the * standalone TclOO version matches. Also make sure that this matches the diff --git a/win/makefile.bc b/win/makefile.bc index e2e8a00..c339527 100644 --- a/win/makefile.bc +++ b/win/makefile.bc @@ -574,7 +574,7 @@ $(GENERICDIR)\regguts.h: $(GENERICDIR)\regcustom.h $(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$@ $< {$(GENERICDIR)}.c{$(TMPDIR)}.obj: - $(cc32) -DBUILD_tcl -DBUILD_tcloo $(TCL_CFLAGS) -o$@ $< + $(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$@ $< {$(ROOT)\compat}.c{$(TMPDIR)}.obj: $(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$@ $< -- cgit v0.12