diff options
| author | donal.k.fellows@manchester.ac.uk <dkf> | 2007-09-08 16:01:20 (GMT) |
|---|---|---|
| committer | donal.k.fellows@manchester.ac.uk <dkf> | 2007-09-08 16:01:20 (GMT) |
| commit | 587f0461c0e348113140b137d63ea58b585f7160 (patch) | |
| tree | d5a99eedcb31cb044b54e5d7374154706dca4762 /generic/tkBitmap.c | |
| parent | dc46bbfe7b289fb3fa78959bbf1835ad0a07598e (diff) | |
| download | tk-587f0461c0e348113140b137d63ea58b585f7160.zip tk-587f0461c0e348113140b137d63ea58b585f7160.tar.gz tk-587f0461c0e348113140b137d63ea58b585f7160.tar.bz2 | |
Assorted minor cleanups.
Diffstat (limited to 'generic/tkBitmap.c')
| -rw-r--r-- | generic/tkBitmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c index 8fa32c1..33979d8 100644 --- a/generic/tkBitmap.c +++ b/generic/tkBitmap.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: tkBitmap.c,v 1.19 2007/09/07 00:34:51 dgp Exp $ + * RCS: @(#) $Id: tkBitmap.c,v 1.20 2007/09/08 16:01:20 dkf Exp $ */ #include "tkInt.h" @@ -25,7 +25,7 @@ * that warning message. */ -#if defined(__WIN32__) || defined(_WIN32) +#if (defined(__WIN32__) || defined(_WIN32)) && !defined(__GNUC__) #pragma warning (disable : 4305) #endif @@ -40,7 +40,7 @@ #include "question.xbm" #include "warning.xbm" -#if defined(__WIN32__) || defined(_WIN32) +#if (defined(__WIN32__) || defined(_WIN32)) && !defined(__GNUC__) #pragma warning (default : 4305) #endif |