RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 01-Aug-2007 18:00:36 Branch: HEAD Handle: 2007080117003600 Modified files: rpm system.h Log: unbreak the __FUNCTION__ check as the macro is defined only _inside_ a function and hence cannot be checked with defined() in system.h Summary: Revision Changes Path 2.77 +2 -2 rpm/system.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/system.h ============================================================================ $ cvs diff -u -r2.76 -r2.77 system.h --- rpm/system.h 1 Aug 2007 13:22:55 -0000 2.76 +++ rpm/system.h 1 Aug 2007 16:00:36 -0000 2.77 @@ -706,8 +706,8 @@ #endif /* provide fallback definition for GCC function name symbol */ -#if !defined(__FUNCTION__) || !(defined(__GNUC__) && __GNUC__ >= 2) -#if defined(__linux__) || defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#if !(defined(__GNUC__) && __GNUC__ >= 2) +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L #define __FUNCTION__ __func__ #else #define __FUNCTION__ "<unknown>" @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org