diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-15 04:54:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-15 04:54:19 (GMT) |
| commit | b68b8009bd3e885e1b2b4b6204c92d9791ea6f1b (patch) | |
| tree | a87710d391e060d7a0af577ec69ea1143ffb9c48 /generic/tclPlatDecls.h | |
| parent | d7dccda78eed3f2ba6f123ccff8c61b9f7d4bfe0 (diff) | |
| parent | 7ac6053161fe49bc32f962b38e67f94f172ce709 (diff) | |
| download | tcl-b68b8009bd3e885e1b2b4b6204c92d9791ea6f1b.zip tcl-b68b8009bd3e885e1b2b4b6204c92d9791ea6f1b.tar.gz tcl-b68b8009bd3e885e1b2b4b6204c92d9791ea6f1b.tar.bz2 | |
Revert part of [5caa06383d] move Tcl_MacOSXOpenBundleResources and Tcl_MacOSXOpenVersionedBundleResources from the UNIX stub table back to its own osx stub table, instead let cygwin make use of the win32 stub table
Diffstat (limited to 'generic/tclPlatDecls.h')
| -rw-r--r-- | generic/tclPlatDecls.h | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index 3d6339b..8652e8d 100644 --- a/generic/tclPlatDecls.h +++ b/generic/tclPlatDecls.h @@ -40,25 +40,7 @@ * Exported function declarations: */ -#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ -#ifndef Tcl_MacOSXOpenBundleResources_TCL_DECLARED -#define Tcl_MacOSXOpenBundleResources_TCL_DECLARED -/* 0 */ -EXTERN int Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp, - CONST char *bundleName, int hasResourceFile, - int maxPathLen, char *libraryPath); -#endif -#ifndef Tcl_MacOSXOpenVersionedBundleResources_TCL_DECLARED -#define Tcl_MacOSXOpenVersionedBundleResources_TCL_DECLARED -/* 1 */ -EXTERN int Tcl_MacOSXOpenVersionedBundleResources( - Tcl_Interp *interp, CONST char *bundleName, - CONST char *bundleVersion, - int hasResourceFile, int maxPathLen, - char *libraryPath); -#endif -#endif /* UNIX */ -#ifdef __WIN32__ /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ #ifndef Tcl_WinUtfToTChar_TCL_DECLARED #define Tcl_WinUtfToTChar_TCL_DECLARED /* 0 */ @@ -95,11 +77,7 @@ typedef struct TclPlatStubs { int magic; struct TclPlatStubHooks *hooks; -#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ - int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, CONST char *bundleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */ - int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, CONST char *bundleName, CONST char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); /* 1 */ -#endif /* UNIX */ -#ifdef __WIN32__ /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ TCHAR * (*tcl_WinUtfToTChar) (CONST char *str, int len, Tcl_DString *dsPtr); /* 0 */ char * (*tcl_WinTCharToUtf) (CONST TCHAR *str, int len, Tcl_DString *dsPtr); /* 1 */ #endif /* WIN */ @@ -123,17 +101,7 @@ extern TclPlatStubs *tclPlatStubsPtr; * Inline function declarations: */ -#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ -#ifndef Tcl_MacOSXOpenBundleResources -#define Tcl_MacOSXOpenBundleResources \ - (tclPlatStubsPtr->tcl_MacOSXOpenBundleResources) /* 0 */ -#endif -#ifndef Tcl_MacOSXOpenVersionedBundleResources -#define Tcl_MacOSXOpenVersionedBundleResources \ - (tclPlatStubsPtr->tcl_MacOSXOpenVersionedBundleResources) /* 1 */ -#endif -#endif /* UNIX */ -#ifdef __WIN32__ /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ #ifndef Tcl_WinUtfToTChar #define Tcl_WinUtfToTChar \ (tclPlatStubsPtr->tcl_WinUtfToTChar) /* 0 */ |