- (bal) Reverse logic, use __func__ first since it's C99

2 files changed, 8 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 776685fa7..285918544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -134,9 +134,10 @@
  - (bal) Forgot to add msg.c Makefile.in.
  - (bal) monitor_mm.c typos.
  - (bal) Refixed auth2.c.  It was never fully commited while spliting out
-        authentication to different files.
+   authentication to different files.
  - (bal) ssh-keysign should build and install correctly now.  Phase two
    would be to clean out any dead wood and disable ssh setuid on install.
+ - (bal) Reverse logic, use __func__ first since it's C99
 
 20020604
  - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
@@ -821,4 +822,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2184 2002/06/07 03:11:38 mouring Exp $
+$Id: ChangeLog,v 1.2185 2002/06/07 03:19:35 mouring Exp $
diff --git a/defines.h b/defines.h
index 954366f3a..1f52c545c 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.89 2002/04/25 17:56:07 stevesk Exp $ */
+/* $Id: defines.h,v 1.90 2002/06/07 03:19:36 mouring Exp $ */
 
 
 /* Constants */
@@ -460,10 +460,10 @@ struct winsize {
 # define OPENSSL_free(x) Free(x)
 #endif
 
-#if defined(HAVE___func__)
-#  define __FUNCTION__ __func__
-#elif !defined(HAVE___FUNCTION__)
-#  define __FUNCTION__ ""
+#if !defined(HAVE___func__) && defined(HAVE___FUNCTION__)
+#  define __func__ __FUNCTION__
+#elif !defined(HAVE___func__)
+#  define __func__ ""
 #endif
 
 /*