--- fs/smbfs/smb_debug.h.orig 2001-01-01 18:57:08.000000000 +0100
+++ fs/smbfs/smb_debug.h 2002-09-13 19:23:11.000000000 +0200
@@ -10,15 +10,24 @@
* safety checks that should never happen ???
* these are normally enabled.
*/
+
#ifdef SMBFS_PARANOIA
+#if __GNUC__>=3
+#define PARANOIA(fmt,x...) printk(KERN_NOTICE "%s: " fmt, __FUNCTION__, ##x)
+#else
#define PARANOIA(x...) printk(KERN_NOTICE __FUNCTION__ ": " x)
+#endif
#else
#define PARANOIA(x...) do { ; } while(0)
#endif
/* lots of debug messages */
#ifdef SMBFS_DEBUG_VERBOSE
+#if __GNUC__>=3
+#define VERBOSE(fmt,x...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__, ##x)
+#else
#define VERBOSE(x...) printk(KERN_DEBUG __FUNCTION__ ": " x)
+#endif
#else
#define VERBOSE(x...) do { ; } while(0)
#endif
@@ -28,7 +37,11 @@
* too common name.
*/
#ifdef SMBFS_DEBUG
+#if __GNUC__>=3
+#define DEBUG1(fmt,x...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__, ##x)
+#else
#define DEBUG1(x...) printk(KERN_DEBUG __FUNCTION__ ": " x)
+#endif
#else
#define DEBUG1(x...) do { ; } while(0)
#endif
On Fri, 13 Sep 2002, Andreas Steinmetz wrote:
> Hi,
> attached is a fix for gcc 3.2 deprecated usage warnings for __FUNCTION__
> in smb_debug.h. As gcc 2.95.3 doesn't issue the warning and can't handle
> the new macro there's a macro selection based on the compiler major
> version. Patch is against 2.4.20pre7.
Why not just take the version from 2.5?
Or is there a problem with this one too and gcc2.95.3?
#ifdef SMBFS_PARANOIA
# define PARANOIA(f, a...) printk(KERN_NOTICE "%s: " f, __FUNCTION__ , ## a)
#else
# define PARANOIA(f, a...) do { ; } while(0)
#endif
etc.
Note the extra space ...
/Urban
I'm just wary about the extra blank which is error prone. Otherwise
there's no problem.
Urban Widmark wrote:
> On Fri, 13 Sep 2002, Andreas Steinmetz wrote:
>
>
>>Hi,
>>attached is a fix for gcc 3.2 deprecated usage warnings for __FUNCTION__
>>in smb_debug.h. As gcc 2.95.3 doesn't issue the warning and can't handle
>>the new macro there's a macro selection based on the compiler major
>>version. Patch is against 2.4.20pre7.
>
>
> Why not just take the version from 2.5?
> Or is there a problem with this one too and gcc2.95.3?
>
> #ifdef SMBFS_PARANOIA
> # define PARANOIA(f, a...) printk(KERN_NOTICE "%s: " f, __FUNCTION__ , ## a)
> #else
> # define PARANOIA(f, a...) do { ; } while(0)
> #endif
>
> etc.
>
> Note the extra space ...
>
> /Urban
>
>
--
Andreas Steinmetz
D.O.M. Datenverarbeitung GmbH
On Sat, Sep 14, 2002 at 10:28:06AM +0200, Urban Widmark wrote:
> On Fri, 13 Sep 2002, Andreas Steinmetz wrote:
>
> > Hi,
> > attached is a fix for gcc 3.2 deprecated usage warnings for __FUNCTION__
> > in smb_debug.h. As gcc 2.95.3 doesn't issue the warning and can't handle
> > the new macro there's a macro selection based on the compiler major
> > version. Patch is against 2.4.20pre7.
>
> Why not just take the version from 2.5?
> Or is there a problem with this one too and gcc2.95.3?
>
> #ifdef SMBFS_PARANOIA
> # define PARANOIA(f, a...) printk(KERN_NOTICE "%s: " f, __FUNCTION__ , ## a)
> #else
> # define PARANOIA(f, a...) do { ; } while(0)
> #endif
>
> etc.
>
> Note the extra space ...
I've tried to provoke this error, but been unable to; the code
works just fine even without the extra space. Can anyone
confirm if gcc-2.95.4 in Debian lacks this bug?!
Anyway, *please* can we try to avoid GCC-versioned code as much as
possible? Either we raise the required GCC-version (not possible until
the SPARC64-people become perfectly happy with gcc-3.2) or we stay at
a lower version and work around the warts.
Regards: David Weinehall
--
/> David Weinehall <[email protected]> /> Northern lights wander <\
// Maintainer of the v2.0 kernel // Dance across the winter sky //
\> http://www.acc.umu.se/~tao/ </ Full colour fire </