=================================================================== RCS file: /home/cvs/OpenXM_contrib/gnuplot/Attic/stdfn.h,v retrieving revision 1.1 retrieving revision 1.1.1.3 diff -u -p -r1.1 -r1.1.1.3 --- OpenXM_contrib/gnuplot/Attic/stdfn.h 2000/01/09 17:00:55 1.1 +++ OpenXM_contrib/gnuplot/Attic/stdfn.h 2003/09/15 07:09:23 1.1.1.3 @@ -1,5 +1,5 @@ /* - * $Id: stdfn.h,v 1.1 2000/01/09 17:00:55 maekawa Exp $ + * $Id: stdfn.h,v 1.1.1.3 2003/09/15 07:09:23 ohara Exp $ * */ @@ -221,14 +221,15 @@ extern int errno; # endif /* HAVE_VALUES_H */ #endif /* !NO_LIMITS_H */ -#ifdef NO_TIME_H -# ifndef time_t /* should be #defined by config.h, then... */ -# define time_t long -# endif -#else -# include /* ctime etc, should also define time_t and struct tm */ +/* ctime etc, should also define time_t and struct tm */ +#ifndef NO_TIME_H +# include #endif +#ifndef HAVE_TIME_T_IN_TIME_H +# define time_t long +#endif + #if defined(PIPES) && (defined(VMS) || (defined(OSK) && defined(_ANSI_EXT))) || defined(PIPES) && defined(AMIGA_SC_6_1) FILE *popen __PROTO((char *, char *)); int pclose __PROTO((FILE *)); @@ -246,6 +247,23 @@ int pclose __PROTO((FILE *)); # include #endif +/* Normally in */ +#ifndef M_PI +# define M_PI 3.14159265358979323846 +#endif +#ifndef M_PI_2 +# define M_PI_2 1.57079632679489661923 +#endif + +#ifndef HAVE_STRCASECMP +# ifdef HAVE_STRICMP +# define strcasecmp stricmp +# else +int gp_stricmp __PROTO((const char *, const char *)); +# define strcasecmp gp_stricmp +# endif +#endif + #ifndef HAVE_STRNICMP # ifdef HAVE_STRNCASECMP # define strnicmp strncasecmp @@ -255,25 +273,13 @@ int strnicmp __PROTO((char *, char *, int)); #endif /* Argument types for select() */ -#ifdef SELECT_TYPE_ARG1 -# define gp_nfds_t SELECT_TYPE_ARG1 -#else -# define gp_nfds_t int -#endif /* 1 */ -#ifdef SELECT_TYPE_ARG234 -# define gp_fd_set_p SELECT_TYPE_ARG234 -#else -# ifndef __EMX__ -# define gp_fd_set_p (int *) -# else -# define gp_fd_set_p (fd_set *) -# endif -#endif /* 234 */ -#ifdef SELECT_TYPE_ARG5 -# define gp_timeval_p SELECT_TYPE_ARG5 -#else -# define gp_timeval_p (struct timeval *) -#endif /* 5 */ +/* These may need some work ... */ +#ifndef fd_set_size_t +# define fd_set_size_t size_t +#endif +#ifndef SELECT_FD_SET_CAST +# define SELECT_FD_SET_CAST +#endif #ifndef GP_GETCWD # if defined(HAVE_GETCWD)