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:
parent
52950081d3
commit
2238745548
|
@ -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.
|
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
|
||||||
|
|
|
@ -26,16 +26,20 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.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 EROOT "@EROOT@"
|
||||||
#define EBIN "@EBIN@"
|
#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 */
|
/* Data structures & primitives */
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
|
|
@ -39,6 +39,11 @@
|
||||||
|
|
||||||
#include "epplet.h"
|
#include "epplet.h"
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#ifdef HAVE_STDARG_H
|
||||||
|
# include <stdarg.h>
|
||||||
|
#elif defined(HAVE_VARARGS_H)
|
||||||
|
# include <varargs.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Shamelessly snarfed from sane...
|
* Shamelessly snarfed from sane...
|
||||||
|
@ -83,9 +88,9 @@ Evsnprintf(char *str, size_t count, const char *fmt, va_list args)
|
||||||
return (strlen(str));
|
return (strlen(str));
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_STDARGS
|
#ifdef HAVE_STDARG_H
|
||||||
int
|
int
|
||||||
Esnprintf(char *str, size_t count, const char *fmt,...)
|
Esnprintf(char *str, size_t count, const char *fmt, ...)
|
||||||
#else
|
#else
|
||||||
int
|
int
|
||||||
Esnprintf(va_alist)
|
Esnprintf(va_alist)
|
||||||
|
@ -93,7 +98,7 @@ Esnprintf(va_alist)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
#ifndef HAVE_STDARGS
|
#ifndef HAVE_STDARG_H
|
||||||
char *str;
|
char *str;
|
||||||
size_t count;
|
size_t count;
|
||||||
char *fmt;
|
char *fmt;
|
||||||
|
|
|
@ -82,9 +82,8 @@ fi
|
||||||
|
|
||||||
dnl# Checks for header files.
|
dnl# Checks for header files.
|
||||||
AC_HEADER_SYS_WAIT
|
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_HEADER_TIME
|
||||||
AC_CHECK_HEADER(stdarg.h, AC_DEFINE(HAVE_STDARGS))
|
|
||||||
|
|
||||||
dnl# Missing typedefs and replacements
|
dnl# Missing typedefs and replacements
|
||||||
AC_TYPE_MODE_T
|
AC_TYPE_MODE_T
|
||||||
|
|
Loading…
Reference in New Issue