From 22297e2b0a9fc24e13686771ff54709746ed0310 Mon Sep 17 00:00:00 2001 From: hobbs Date: Fri, 19 Nov 1999 22:00:19 +0000 Subject: * win/tkWinInt.h: removed TkFontAttributes typedef (was redundant with tkFont.h). * win/tkWinPort.h: put #ifndef __GNUC__ around redefinition of str[n]casecmp, as cygwin uses the originals. * win/tkWinX.c: changed GetCurrentTime to GetTickCount (the former is deprecated). [Bug: 2053] --- win/tkWinInt.h | 4 +--- win/tkWinPort.h | 8 +++++--- win/tkWinX.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/win/tkWinInt.h b/win/tkWinInt.h index 7fb1ea4..7aaabaa 100644 --- a/win/tkWinInt.h +++ b/win/tkWinInt.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinInt.h,v 1.6 1999/04/16 01:51:52 stanton Exp $ + * RCS: @(#) $Id: tkWinInt.h,v 1.7 1999/11/19 22:00:19 hobbs Exp $ */ #ifndef _TKWININT @@ -41,8 +41,6 @@ #define WS_EX_TOOLWINDOW 0x00000080L #endif -typedef struct TkFontAttributes TkFontAttributes; - /* * The TkWinDCState is used to save the state of a device context * so that it can be restored later. diff --git a/win/tkWinPort.h b/win/tkWinPort.h index 4eaa443..9b327a5 100644 --- a/win/tkWinPort.h +++ b/win/tkWinPort.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinPort.h,v 1.6 1999/07/22 21:51:25 redman Exp $ + * RCS: @(#) $Id: tkWinPort.h,v 1.7 1999/11/19 22:00:19 hobbs Exp $ */ #ifndef _WINPORT @@ -48,8 +48,10 @@ # define hypot _hypot #endif /* _MSC_VER */ -#define strncasecmp strnicmp -#define strcasecmp stricmp +#ifndef __GNUC__ +# define strncasecmp strnicmp +# define strcasecmp stricmp +#endif #define NBBY 8 diff --git a/win/tkWinX.c b/win/tkWinX.c index 85becc2..e60d001 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinX.c,v 1.6 1999/07/09 02:10:07 stanton Exp $ + * RCS: @(#) $Id: tkWinX.c,v 1.7 1999/11/19 22:00:19 hobbs Exp $ */ #include "tkWinInt.h" @@ -1128,5 +1128,5 @@ TkWinResendEvent(wndproc, hwnd, eventPtr) unsigned long TkpGetMS() { - return GetCurrentTime(); + return GetTickCount(); } -- cgit v0.12