diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-10 22:01:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-10 22:01:37 (GMT) |
| commit | 8c7e557089e8b305b0ad128e095b446cddf9ecb3 (patch) | |
| tree | ec2746543e6f935b523c90c752b6140d6b77adb9 /unix | |
| parent | a55cf4a7e5aa5b506929c232ed2a3c8402a41852 (diff) | |
| parent | 8084e168af0746710f165ebb4a157b45dc3b3756 (diff) | |
| download | tcl-8c7e557089e8b305b0ad128e095b446cddf9ecb3.zip tcl-8c7e557089e8b305b0ad128e095b446cddf9ecb3.tar.gz tcl-8c7e557089e8b305b0ad128e095b446cddf9ecb3.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 5 | ||||
| -rw-r--r-- | unix/configure.in | 5 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/unix/configure b/unix/configure index 8f25c08..1151497 100755 --- a/unix/configure +++ b/unix/configure @@ -1353,6 +1353,11 @@ if test -r "$cache_file" -a -f "$cache_file"; then fi #------------------------------------------------------------------------ +# Empty slate for bundled packages, to avoid stale configuration +#------------------------------------------------------------------------ +rm -Rf pkgs + +#------------------------------------------------------------------------ # Handle the --prefix=... option #------------------------------------------------------------------------ diff --git a/unix/configure.in b/unix/configure.in index 066a84f..4fc93dd 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -43,6 +43,11 @@ if test -r "$cache_file" -a -f "$cache_file"; then fi #------------------------------------------------------------------------ +# Empty slate for bundled packages, to avoid stale configuration +#------------------------------------------------------------------------ +rm -Rf pkgs + +#------------------------------------------------------------------------ # Handle the --prefix=... option #------------------------------------------------------------------------ diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index fac9f75..c56988e 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -88,7 +88,6 @@ typedef off_t Tcl_SeekOffset; # define HINSTANCE void * # define SOCKET unsigned int # define WSAEWOULDBLOCK 10035 - typedef char TCHAR; typedef unsigned short WCHAR; DLLIMPORT extern __stdcall int GetModuleHandleExW(unsigned int, const char *, void *); DLLIMPORT extern __stdcall int GetModuleFileNameW(void *, const char *, int); |