changeset 810:85b3d7c8bf60

Fix a few compilation errors on NetBSD -- reported by Thomas Klausner (thanks\!)
author Sebastien Decugis <sdecugis@freediameter.net>
date Fri, 24 Aug 2012 21:22:41 +0200
parents 3753d7145da1
children edb5228bd753
files include/freeDiameter/libfdproto.h
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/include/freeDiameter/libfdproto.h	Fri Aug 24 00:30:15 2012 +0200
+++ b/include/freeDiameter/libfdproto.h	Fri Aug 24 21:22:41 2012 +0200
@@ -73,6 +73,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <stdarg.h>
 
 #ifdef DEBUG
 #include <libgen.h>	/* for basename if --dbg_file is specified */
@@ -159,7 +160,7 @@
  * MACRO:
  *
  * PARAMETERS:
- *  fstr        : Stream where the text will be sent (default: stdout)
+ *  fstr        : Stream where the text will be sent to (default: stdout)
  *  format      : Same format string as in the printf function
  *  va_list     : Argument list
  *
@@ -214,13 +215,13 @@
 extern int fd_g_debug_lvl;
 
 /* Some portability code to get nice function name in __PRETTY_FUNCTION__ */
-#if __STDC_VERSION__ < 199901L
+#if (!defined( __func__)) && (__STDC_VERSION__ < 199901L)
 # if __GNUC__ >= 2
 #  define __func__ __FUNCTION__
 # else /* __GNUC__ >= 2 */
 #  define __func__ "<unknown>"
 # endif /* __GNUC__ >= 2 */
-#endif /* __STDC_VERSION__ < 199901L */
+#endif /*(!defined( __func__)) && (__STDC_VERSION__ < 199901L) */
 #ifndef __PRETTY_FUNCTION__
 #define __PRETTY_FUNCTION__ __func__
 #endif /* __PRETTY_FUNCTION__ */
"Welcome to our mercurial repository"