[Plplot-cvs] SF.net SVN: plplot:[8715] trunk

[<sm...@us...>]

Revision: 8715
          http://plplot.svn.sourceforge.net/plplot/?rev=8715&view=rev
Author:   smekal
Date:     2008-08-26 14:30:01 +0000 (Tue, 26 Aug 2008)

Log Message:
-----------
Renamed HAVE_USLEEP to PL_HAVE_USLEEP in order to prevent warnings concerning the wxwidgets driver, since HAVE_USLEEP may already be defined in the wxwidgets headers.

Modified Paths:
--------------
    trunk/cmake/modules/plplot.cmake
    trunk/config.h.cmake
    trunk/examples/c/x01c.c
    trunk/examples/c/x17c.c
    trunk/examples/c++/x01.cc
    trunk/examples/c++/x17.cc
    trunk/include/plConfig.h.cmake

Modified: trunk/cmake/modules/plplot.cmake
===================================================================
--- trunk/cmake/modules/plplot.cmake	2008-08-26 13:41:03 UTC (rev 8714)
+++ trunk/cmake/modules/plplot.cmake	2008-08-26 14:30:01 UTC (rev 8715)
@@ -183,7 +183,7 @@
 
 include(CheckFunctionExists)
 check_function_exists(popen HAVE_POPEN)
-check_function_exists(usleep HAVE_USLEEP)
+check_function_exists(usleep PL_HAVE_USLEEP)
 check_function_exists(isinf HAVE_ISINF)
 check_function_exists(finite HAVE_FINITE)
 if(NOT HAVE_FINITE)

Modified: trunk/config.h.cmake
===================================================================
--- trunk/config.h.cmake	2008-08-26 13:41:03 UTC (rev 8714)
+++ trunk/config.h.cmake	2008-08-26 14:30:01 UTC (rev 8715)
@@ -159,7 +159,7 @@
 #cmakedefine HAVE_UNISTD_H 1
 
 /* Define if usleep is available */
-#cmakedefine HAVE_USLEEP
+#cmakedefine PL_HAVE_USLEEP
 
 /* Define to 1 if you have the `vfork' function. */
 #cmakedefine HAVE_VFORK 1

Modified: trunk/examples/c/x01c.c
===================================================================
--- trunk/examples/c/x01c.c	2008-08-26 13:41:03 UTC (rev 8714)
+++ trunk/examples/c/x01c.c	2008-08-26 14:30:01 UTC (rev 8715)
@@ -259,7 +259,7 @@
 /* it does not work in double buffering mode, however */
 
     if (do_test && test_xor) {
-#ifdef HAVE_USLEEP
+#ifdef PL_HAVE_USLEEP
 	plxormod(1, &st); /* enter xor mode */
 	if (st) {
 	  for (i=0; i<60; i++) {

Modified: trunk/examples/c/x17c.c
===================================================================
--- trunk/examples/c/x17c.c	2008-08-26 13:41:03 UTC (rev 8714)
+++ trunk/examples/c/x17c.c	2008-08-26 14:30:01 UTC (rev 8715)
@@ -123,7 +123,7 @@
     dt = 0.1;
 
     for (n = 0; n < nsteps; n++) {
-#ifdef HAVE_USLEEP
+#ifdef PL_HAVE_USLEEP
 	usleep(10000);	/* wait a little (10 ms) to simulate time elapsing */
 #else
 # ifdef HAS_POLL

Modified: trunk/examples/c++/x01.cc
===================================================================
--- trunk/examples/c++/x01.cc	2008-08-26 13:41:03 UTC (rev 8714)
+++ trunk/examples/c++/x01.cc	2008-08-26 14:30:01 UTC (rev 8715)
@@ -270,7 +270,7 @@
 /* it does not work in double buffering mode, however */
 
   if (do_test && test_xor) {
-#ifdef HAVE_USLEEP
+#ifdef PL_HAVE_USLEEP
     pls->xormod(true, &st); /* enter xor mode */
     if (st) {
       for (i=0; i<60; i++) {

Modified: trunk/examples/c++/x17.cc
===================================================================
--- trunk/examples/c++/x17.cc	2008-08-26 13:41:03 UTC (rev 8714)
+++ trunk/examples/c++/x17.cc	2008-08-26 14:30:01 UTC (rev 8715)
@@ -150,7 +150,7 @@
   dt = 0.1;
 
   for (n = 0; n < nsteps; n++) {
-#ifdef HAVE_USLEEP
+#ifdef PL_HAVE_USLEEP
     usleep(10000);  /* wait a little (10 ms) to simulate time elapsing */
 #else
 # ifdef HAS_POLL

Modified: trunk/include/plConfig.h.cmake
===================================================================
--- trunk/include/plConfig.h.cmake	2008-08-26 13:41:03 UTC (rev 8714)
+++ trunk/include/plConfig.h.cmake	2008-08-26 14:30:01 UTC (rev 8715)
@@ -72,7 +72,7 @@
 #cmakedefine HAVE_UNISTD_H 1
 
 /* Define if usleep is available */
-#cmakedefine HAVE_USLEEP
+#cmakedefine PL_HAVE_USLEEP
 
 /* Define if you want PLplot's float type to be double */
 #cmakedefine PL_DOUBLE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.