X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblutil%2Fsetproctitle.c;h=6d1ab6a032a83e5fd494917d1f562445ad915a9b;hb=489fd210df1184106b7b92dfe6863aae3d27e88b;hp=d0da848040168f3841b4819f50e409226092f281;hpb=523fd2c891cfdbd318642b20a105adb4b2f9149c;p=openldap

diff --git a/libraries/liblutil/setproctitle.c b/libraries/liblutil/setproctitle.c
index d0da848040..6d1ab6a032 100644
--- a/libraries/liblutil/setproctitle.c
+++ b/libraries/liblutil/setproctitle.c
@@ -1,17 +1,15 @@
+/* $OpenLDAP$ */
 #include "portable.h"
 
 #ifndef HAVE_SETPROCTITLE
 
-#include <stdlib.h>
-#include <ac/string.h>
+#include <stdio.h>
 
-#if defined( HAVE_STDARG_H ) && __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
+#include <ac/stdlib.h>
 
 #include <ac/setproctitle.h>
+#include <ac/string.h>
+#include <ac/stdarg.h>
 
 /*
  * Copyright (c) 1990,1991 Regents of the University of Michigan.
@@ -34,14 +32,7 @@ int	Argc;		/* original argc */
  */
 
 /* VARARGS */
-void setproctitle
-#if defined( HAVE_STDARG_H ) && __STDC__
-	( const char *fmt, ... )
-#else
-	( fmt, va_alist )
-const char *fmt;
-va_dcl
-#endif
+void setproctitle( const char *fmt, ... )
 {
 	static char *endargv = (char *)0;
 	char	*s;
@@ -49,11 +40,7 @@ va_dcl
 	char	buf[ 1024 ];
 	va_list	ap;
 
-#if defined( HAVE_STDARG_H ) && __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 
 #ifdef HAVE_VSNPRINTF
 	buf[sizeof(buf) - 1] = '\0';