* lib/sockio-c.c (openaxiom_sleep): Move to open-axiom.h.

	* clef/edible.c: Include "open-axiom.h".  Use openaxiom_sleep, not
	sleep. 
	* graph/view2D/viewport2D.c: Likewise.
	* graph/viewAlone/spoon2D.c: Likewise.
	* graph/viewAlone/spoonComp.c: Likewise.
	* graph/viewman/fun2D.c: Likewise.
	* graph/viewman/fun3D.c: Likewise.
	* hyper/spadint.c: Likewise.
	* sman/session.c: Likewise.
	* sman/sman.c: Likewise.

5 files changed, 11 insertions, 11 deletions

diff --git a/src/graph/view2D/viewport2D.c b/src/graph/view2D/viewport2D.c
index d0f4ee30..2f499307 100644
--- a/src/graph/view2D/viewport2D.c
+++ b/src/graph/view2D/viewport2D.c
@@ -34,7 +34,6 @@
 */
 
 #define _VIEWPORT2D_C
-#include "openaxiom-c-macros.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,6 +45,8 @@
 #include <X11/Xutil.h>
 #include <limits.h>
 
+#include "open-axiom.h"
+
 #define NotPoint        (SHRT_MAX)
 #define eqNANQ(x)       (x == NotPoint)
 
@@ -571,7 +572,7 @@ makeViewport(char *title,int vX,int vY,int vW,int vH,int showCP)
   /* Create a viewport */
   if (!(viewport = (viewPoints *)malloc(sizeof(viewPoints)))) {
     fprintf(stderr,"Ran out of memory (malloc) trying to create a viewport.\n");
-    sleep(5);
+    openaxiom_sleep(5);
     exitWithAck(RootWindow(dsply,scrn),Window,-1);
   }
 
diff --git a/src/graph/viewAlone/spoon2D.c b/src/graph/viewAlone/spoon2D.c
index 236caeb8..c50e4ba3 100644
--- a/src/graph/viewAlone/spoon2D.c
+++ b/src/graph/viewAlone/spoon2D.c
@@ -34,12 +34,12 @@
 */
 
 #define _SPOON2D_C
-#include "openaxiom-c-macros.h"
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "open-axiom.h"
 #include "viewAlone.h"
 
 
@@ -133,7 +133,7 @@ spoonView2D(void)
     /*** get acknowledge from viewport */
 
     code = read(viewP.viewIn,&(viewP.viewWindow),sizeof(Window));
-    sleep(1);  /* wait a second...*/
+    openaxiom_sleep(1);  /* wait a second...*/
     exit(0); 
 
   }   /* switch */
diff --git a/src/graph/viewAlone/spoonComp.c b/src/graph/viewAlone/spoonComp.c
index 79fe174c..92902443 100644
--- a/src/graph/viewAlone/spoonComp.c
+++ b/src/graph/viewAlone/spoonComp.c
@@ -34,12 +34,12 @@
 */
 
 #define _SPOONCOMP_C
-#include "openaxiom-c-macros.h"
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 
+#include "open-axiom.h"
 #include "viewAlone.h"
 #include "mode.h"
 
@@ -155,7 +155,7 @@ spoonView3D(int type)
     
     /*** get acknowledge from viewport */
     code = read(viewP.viewIn,&(viewP.viewWindow),sizeof(Window));
-    sleep(1);  /* wait a second...*/
+    openaxiom_sleep(1);  /* wait a second...*/
     exit(0); 
     
   }   /* switch */
diff --git a/src/graph/viewman/fun2D.c b/src/graph/viewman/fun2D.c
index 3f38dd71..dd98f836 100644
--- a/src/graph/viewman/fun2D.c
+++ b/src/graph/viewman/fun2D.c
@@ -34,7 +34,6 @@
 */
 
 #define _FUN2D_C
-#include "openaxiom-c-macros.h"
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -42,7 +41,7 @@
 #include <string.h>
 
 
-
+#include "open-axiom.h"
 #include "viewman.h"
 #include "actions.h"
 
@@ -282,7 +281,7 @@ forkView2D(void)
          /*** get acknowledge from viewport */
 
     code = readViewport(viewport,&(viewport->viewWindow),sizeof(Window));
-    sleep(1);  /* wait a second...*/
+    openaxiom_sleep(1);  /* wait a second...*/
     send_int(spadSock,viewport->PID);  /* acknowledge to spad */
 
   }   /* switch */
diff --git a/src/graph/viewman/fun3D.c b/src/graph/viewman/fun3D.c
index 19e186ef..f6f4cd23 100644
--- a/src/graph/viewman/fun3D.c
+++ b/src/graph/viewman/fun3D.c
@@ -34,13 +34,13 @@
 */
 
 #define _FUN3D_C
-#include "openaxiom-c-macros.h"
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "open-axiom.h"
 #include "viewman.h"
 #include "mode.h"
 #include "actions.h"
@@ -355,7 +355,7 @@ forkView3D(int typeOfViewport)
     
          /*** get acknowledge from viewport */
     code = readViewport(viewport,&(viewport->viewWindow),sizeof(Window)); 
-    sleep(1);  /* wait a second...*/
+    openaxiom_sleep(1);  /* wait a second...*/
     send_int(spadSock,viewport->PID);  /* acknowledge to spad */
 
   }   /* switch */