[Plplot-cvs] plplot/include plConfig.h.in,1.13,1.14 plplot.h,1.167,1.168

[Alan W. I. <ai...@us...>]

Update of /cvsroot/plplot/plplot/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1131/include

Modified Files:
	plConfig.h.in plplot.h 
Log Message:
Applied Peter O'Gorman's patches to deal with stdint.h issues for C++ systems
on various Unix platforms.  The patches were also tested on Debian stable
(see plplot-devel list for details).


Index: plConfig.h.in
===================================================================
RCS file: /cvsroot/plplot/plplot/include/plConfig.h.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- plConfig.h.in	27 Apr 2005 06:44:01 -0000	1.13
+++ plConfig.h.in	1 Nov 2005 23:46:18 -0000	1.14
@@ -62,6 +62,12 @@
 /* Define if isnan is available */
 #undef HAVE_ISNAN
 
+/* Define if you have c++ accessible stdint.h */
+#undef HAVE_CXX_STDINT_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 

Index: plplot.h
===================================================================
RCS file: /cvsroot/plplot/plplot/include/plplot.h,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- plplot.h	22 May 2005 17:11:35 -0000	1.167
+++ plplot.h	1 Nov 2005 23:46:18 -0000	1.168
@@ -140,7 +140,8 @@
 #define PLFLT_MIN  FLT_MIN
 #endif
 
-#if defined(HAVE_STDINT_H)
+#if (defined(HAVE_STDINT_H) && !defined(__cplusplus)) ||\
+(defined(__cplusplus) && defined(HAVE_CXX_STDINT_H))
 #include <stdint.h>
 /* This is apparently portable if stdint.h exists. */
 typedef uint32_t PLUNICODE;