diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-06-16 16:27:01 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-06-16 16:27:01 (GMT) |
| commit | 3cbd3b2bede59c6fd03330ac014e626a0a776522 (patch) | |
| tree | 8e125264e32e68a389be074bfb8795cd212b9114 /generic/tclOO.h | |
| parent | 95fb48bf07be37ad0717475514d2c444602a0a6c (diff) | |
| parent | 4fac9b8d0fb5648943635cf4c956c9518e610921 (diff) | |
| download | tcl-bug_16828b3744.zip tcl-bug_16828b3744.tar.gz tcl-bug_16828b3744.tar.bz2 | |
Merge tip of core-8-6-branchbug_16828b3744
Diffstat (limited to 'generic/tclOO.h')
| -rw-r--r-- | generic/tclOO.h | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/generic/tclOO.h b/generic/tclOO.h index cf253b1..696908a 100644 --- a/generic/tclOO.h +++ b/generic/tclOO.h @@ -12,21 +12,6 @@ #ifndef TCLOO_H_INCLUDED #define TCLOO_H_INCLUDED -#include "tcl.h" - -#ifndef TCLOOAPI -# if defined(BUILD_tcl) || defined(BUILD_TclOO) -# define TCLOOAPI MODULE_SCOPE -# else -# define TCLOOAPI extern -# undef USE_TCLOO_STUBS -# define USE_TCLOO_STUBS 1 -# endif -#endif - -extern const char *TclOOInitializeStubs( - Tcl_Interp *, const char *version); -#define Tcl_OOInitStubs(interp) TclOOInitializeStubs((interp), TCLOO_VERSION) /* * Be careful when it comes to versioning; need to make sure that the @@ -39,9 +24,27 @@ extern const char *TclOOInitializeStubs( * win/tclooConfig.sh */ -#define TCLOO_VERSION "1.0" +#define TCLOO_VERSION "1.0.4" #define TCLOO_PATCHLEVEL TCLOO_VERSION +#include "tcl.h" + +/* + * For C++ compilers, use extern "C" + */ + +#ifdef __cplusplus +extern "C" { +#endif + +extern const char *TclOOInitializeStubs( + Tcl_Interp *, const char *version); +#define Tcl_OOInitStubs(interp) \ + TclOOInitializeStubs((interp), TCLOO_VERSION) +#ifndef USE_TCL_STUBS +# define TclOOInitializeStubs(interp, version) (TCLOO_PATCHLEVEL) +#endif + /* * These are opaque types. */ @@ -130,6 +133,9 @@ typedef struct { #include "tclOODecls.h" +#ifdef __cplusplus +} +#endif #endif /* |