diff options
| author | stanton <stanton> | 1999-06-02 18:15:54 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-06-02 18:15:54 (GMT) |
| commit | 95719c382eceb24ef2f3ae5dec2fc037f238118f (patch) | |
| tree | f2d1dcbdc9268e15cde481b2d3a32f5d874ed329 | |
| parent | f2be6a0748d89fe4d5446588e1924790eb167887 (diff) | |
| download | tk-95719c382eceb24ef2f3ae5dec2fc037f238118f.zip tk-95719c382eceb24ef2f3ae5dec2fc037f238118f.tar.gz tk-95719c382eceb24ef2f3ae5dec2fc037f238118f.tar.bz2 | |
* generic/tkIntXlibDecls.h:
* xlib/X11/Xlib.h: Added Mac specific defines to help with
compilation.
* generic/tkFont.c: lint
| -rw-r--r-- | generic/tkFont.c | 4 | ||||
| -rw-r--r-- | generic/tkIntXlibDecls.h | 6 | ||||
| -rw-r--r-- | xlib/X11/Xlib.h | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 99584af..a59c1b7 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkFont.c,v 1.4 1999/06/01 18:44:51 stanton Exp $ + * RCS: @(#) $Id: tkFont.c,v 1.5 1999/06/02 18:15:54 stanton Exp $ */ #include "tkPort.h" @@ -3255,7 +3255,7 @@ TkFontParseXLFD(string, faPtr, xaPtr) for (i = 0; *src != '\0'; src++) { if (!(*src & 0x80) && Tcl_UniCharIsUpper(UCHAR(*src))) { - *src = Tcl_UniCharToLower(UCHAR(*src)); + *src = (char) Tcl_UniCharToLower(UCHAR(*src)); } if (*src == '-') { i++; diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 42a486a..a720d5a 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -9,13 +9,17 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.8 1999/05/25 01:31:06 stanton Exp $ + * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.9 1999/06/02 18:15:54 stanton Exp $ */ #ifndef _TKINTXLIBDECLS #define _TKINTXLIBDECLS +#ifdef MAC_TCL +#include "Xutil.h" +#else #include "X11/Xutil.h" +#endif #ifdef BUILD_tk #undef TCL_STORAGE_CLASS diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h index 360e951..a6bb591 100644 --- a/xlib/X11/Xlib.h +++ b/xlib/X11/Xlib.h @@ -58,7 +58,11 @@ typedef unsigned long wchar_t; typedef char *XPointer; #define Bool int +#ifdef MAC_TCL +#define Status int +#else typedef int Status; +#endif #define True 1 #define False 0 |