diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-09-20 21:49:00 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-09-20 21:49:00 +0000 |
| commit | e2aaa07e31895f8de189686378ca2e077b423514 (patch) | |
| tree | f746010ba85686b7657d6b21468e7f9c50c2583c /cut-n-paste-code | |
| parent | d7105b33acbce8a041d27271fba85a9f44a0c3b6 (diff) | |
| download | nautilus-e2aaa07e31895f8de189686378ca2e077b423514.tar.gz | |
Fixed compiling with newer gcc. Freetype was trying to use token pasting
* cut-n-paste-code/freetype/ftdebug.h: Fixed compiling with newer
gcc. Freetype was trying to use token pasting to attach the name
of a function (FTMessage) onto the parameters to that
function. There's no need to attempt this, and it's incorrect. I
removed the token pasting attempt. Perhaps Raph should get this
rolled back into the main freetype soruces.
* libnautilus-extensions/bonobo-stream-vfs.c: Cleaned up the code
a bit to match Nautilus coding style and remove some redundant
stuff.
* libnautilus-extensions/nautilus-bookmark.c:
(nautilus_bookmark_update_icon): Fixed a place where we unref the
old value before ref'ing the new one. It's not really a bug, but
it's a good habit to ref the new value first. Ran into this when
I started looking for NautilusScalableIcon leaks.
Diffstat (limited to 'cut-n-paste-code')
| -rw-r--r-- | cut-n-paste-code/freetype/ftdebug.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/cut-n-paste-code/freetype/ftdebug.h b/cut-n-paste-code/freetype/ftdebug.h index a99ee9a42..a4b438fc3 100644 --- a/cut-n-paste-code/freetype/ftdebug.h +++ b/cut-n-paste-code/freetype/ftdebug.h @@ -36,17 +36,6 @@ #endif - /* A very stupid pre-processor trick. See K&R version 2 */ - /* section A12.3 for details... */ - /* */ - /* It is also described in the section `Separate */ - /* Expansion of Macro Arguments' in the info file */ - /* `cpp.info', describing GNU cpp. */ - /* */ -#define FT_CAT( x, y ) x ## y -#define FT_XCAT( x, y ) FT_CAT( x, y ) - - #ifdef FT_DEBUG_LEVEL_TRACE @@ -144,7 +133,7 @@ do \ { \ if ( ft_trace_levels[FT_COMPONENT] >= level ) \ - FT_XCAT( FT_Message, varformat ); \ + FT_Message varformat; \ } while ( 0 ) @@ -200,7 +189,7 @@ /* print a message and exit */ FT_EXPORT_DEF( void ) FT_Panic ( const char* fmt, ... ); -#define FT_ERROR( varformat ) FT_XCAT( FT_Message, varformat ) +#define FT_ERROR( varformat ) ( FT_Message varformat ) #endif /* FT_DEBUG_LEVEL_TRACE || FT_DEBUG_LEVEL_ERROR */ |