=================================================================== RCS file: /home/cvs/OpenXM_contrib/gnuplot/Attic/plot.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/plot.h 2000/01/09 17:00:54 1.1 +++ OpenXM_contrib/gnuplot/Attic/plot.h 2003/09/15 07:09:23 1.1.1.3 @@ -1,5 +1,5 @@ /* - * $Id: plot.h,v 1.1 2000/01/09 17:00:54 maekawa Exp $ + * $Id: plot.h,v 1.1.1.3 2003/09/15 07:09:23 ohara Exp $ * */ @@ -83,8 +83,7 @@ typedef int TBOOLEAN; /* double true, used in autoscale: 1=autoscale ?min, 2=autoscale ?max */ #define DTRUE 3 -#define Pi 3.141592653589793 -#define DEG2RAD (Pi / 180.0) +#define DEG2RAD (M_PI / 180.0) /* minimum size of points[] in curve_points */ @@ -131,7 +130,6 @@ typedef int TBOOLEAN; #define LEVELS_AUTO 0 /* How contour levels are set */ #define LEVELS_INCREMENTAL 1 /* user specified start & incremnet */ #define LEVELS_DISCRETE 2 /* user specified discrete levels */ -#define MAX_DISCRETE_LEVELS 30 #define ANGLES_RADIANS 0 #define ANGLES_DEGREES 1 @@ -345,10 +343,9 @@ typedef RETSIGTYPE (*sigfunc)__PROTO((int)); typedef RETSIGTYPE (*sigfunc)__PROTO((void)); #endif +/* HBB 20010720: removed 'sortfunc' --- it's no longer used */ #ifndef SORTFUNC_ARGS -typedef int (*sortfunc) __PROTO((const generic *, const generic *)); -#else -typedef int (*sortfunc) __PROTO((SORTFUNC_ARGS, SORTFUNC_ARGS)); +# define SORTFUNC_ARGS const generic * #endif enum operators { @@ -734,8 +731,19 @@ extern char *infile_name; extern struct udft_entry *dummy_func; extern char dummy_var[MAX_NUM_VAR][MAX_ID_LEN+1]; /* from setshow.c */ +/* From version.c */ +extern char gnuplot_version[]; +extern char gnuplot_patchlevel[]; +extern char gnuplot_date[]; +extern char gnuplot_copyright[]; +extern char faq_location[]; +extern char bug_email[]; +extern char help_email[]; +extern char os_name[]; +extern char os_rel[]; + /* Windows needs to redefine stdin/stdout functions */ -#ifdef _Windows +#if defined(_Windows) && !defined(WINDOWS_NO_GUI) # include "win/wtext.h" #endif