svn rev #22018: branches/krb5-1-7/src/include/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22018
Commit By: tlyu
Log Message:
ticket: 6364
version_fixed: 1.7
status: resolved

pull up r21888 from trunk

 ------------------------------------------------------------------------
 r21888 | raeburn | 2009-02-04 21:16:22 -0500 (Wed, 04 Feb 2009) | 11 lines
 Changed paths:
    M /trunk/src/include/k5-platform.h

 ticket: 6364
 subject: declare replacement [v]asprintf functions
 target_version: 1.7
 tags: pullup

 If HAVE_VASPRINTF is not defined, make sure krb5int_{,v}asprintf
 functions always get declared, applying the preprocessor conditional
 test only to the GCC format attribute.  If HAVE_VASPRINTF is defined,
 don't declare them at all.

 This fixes a bunch of function-not-declared warnings under Sun cc.
 ------------------------------------------------------------------------


Changed Files:
U   branches/krb5-1-7/src/include/k5-platform.h
Modified: branches/krb5-1-7/src/include/k5-platform.h
===================================================================
--- branches/krb5-1-7/src/include/k5-platform.h	2009-02-18 18:18:14 UTC (rev 22017)
+++ branches/krb5-1-7/src/include/k5-platform.h	2009-02-18 18:18:21 UTC (rev 22018)
@@ -912,15 +912,19 @@
 #endif /* win32? */
 #endif /* no vsnprintf */
 
+#ifndef HAVE_VASPRINTF
+
+extern int krb5int_vasprintf(char **, const char *, va_list)
 #if !defined(__cplusplus) && (__GNUC__ > 2)
-extern int krb5int_vasprintf(char **, const char *, va_list)
-    __attribute__((__format__(__printf__, 2, 0)));
+    __attribute__((__format__(__printf__, 2, 0)))
+#endif
+    ;
 extern int krb5int_asprintf(char **, const char *, ...)
-    __attribute__((__format__(__printf__, 2, 3)));
+#if !defined(__cplusplus) && (__GNUC__ > 2)
+    __attribute__((__format__(__printf__, 2, 3)))
 #endif
+    ;
 
-#ifndef HAVE_VASPRINTF
-
 #define vasprintf krb5int_vasprintf
 /* Assume HAVE_ASPRINTF iff HAVE_VASPRINTF.  */
 #define asprintf krb5int_asprintf