Fri Nov 12 12:35:49 PST 1999

(KainX)

Cleaning up the epplets is becoming a morning routine for me.... =P


SVN revision: 1279
This commit is contained in:
Michael Jennings 1999-11-12 20:13:03 +00:00
parent 52950081d3
commit 2238745548
4 changed files with 26 additions and 12 deletions

View File

@ -508,3 +508,9 @@ Fri Nov 12 19:14:21 GMT 1999
More E-SD.c changes. Should be better, but let me know if any lag occurs.
-------------------------------------------------------------------------------
Fri Nov 12 12:35:49 PST 1999
(KainX)
Cleaning up the epplets is becoming a morning routine for me.... =P

View File

@ -26,16 +26,20 @@
#include <sys/types.h>
#include <sys/stat.h>
#if defined(HAVE_VARARGS_H) && !defined(HAVE_STDARG_H)
# include <varargs.h>
int Evsnprintf(char *str, size_t count, const char *fmt, va_list args);
int Esnprintf(va_alist);
#else
/* If they don't have stdarg.h, they have bigger problems.... */
# include <stdarg.h>
int Evsnprintf(char *str, size_t count, const char *fmt, va_list args);
int Esnprintf(char *str, size_t count, const char *fmt, ...);
#endif
#define EROOT "@EROOT@"
#define EBIN "@EBIN@"
int Evsnprintf(char *str, size_t count, const char *fmt, va_list args);
#ifdef HAVE_STDARGS
int Esnprintf(char *str, size_t count, const char *fmt,...);
#else
int Esnprintf(va_alist);
#endif
/****************************************************************************/
/* Data structures & primitives */
/****************************************************************************/

View File

@ -39,6 +39,11 @@
#include "epplet.h"
#include <errno.h>
#ifdef HAVE_STDARG_H
# include <stdarg.h>
#elif defined(HAVE_VARARGS_H)
# include <varargs.h>
#endif
/*
* Shamelessly snarfed from sane...
@ -83,9 +88,9 @@ Evsnprintf(char *str, size_t count, const char *fmt, va_list args)
return (strlen(str));
}
#ifdef HAVE_STDARGS
#ifdef HAVE_STDARG_H
int
Esnprintf(char *str, size_t count, const char *fmt,...)
Esnprintf(char *str, size_t count, const char *fmt, ...)
#else
int
Esnprintf(va_alist)
@ -93,7 +98,7 @@ Esnprintf(va_alist)
#endif
{
#ifndef HAVE_STDARGS
#ifndef HAVE_STDARG_H
char *str;
size_t count;
char *fmt;

View File

@ -82,9 +82,8 @@ fi
dnl# Checks for header files.
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(unistd.h time.h math.h pwd.h sys/types.h)
AC_CHECK_HEADERS(unistd.h time.h math.h pwd.h sys/types.h varargs.h stdarg.h)
AC_HEADER_TIME
AC_CHECK_HEADER(stdarg.h, AC_DEFINE(HAVE_STDARGS))
dnl# Missing typedefs and replacements
AC_TYPE_MODE_T