From a53a740a2a1cb6cbfa58cc79caedd4e947ff1ca0 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 28 Nov 2010 18:27:48 +0000
Subject: 	* clef/: Add using directive at toplevel. 	* etc/:
 Likewise. 	* graph/: Likewise. 	* hyper/: Likewise. 	* lib/:
 Likewise. 	* sman/: Likewise. 	* Makefile.am (OA_SMAN_TARGETS): New. 
 (OA_GRAPHICS_TARGETS): Likewise.

---
 src/lib/cfuns-c.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/lib/cfuns-c.c')

diff --git a/src/lib/cfuns-c.c b/src/lib/cfuns-c.c
index d32c584f..572b7835 100644
--- a/src/lib/cfuns-c.c
+++ b/src/lib/cfuns-c.c
@@ -77,6 +77,8 @@
 #  define getegid() getgid()
 #endif
 
+namespace OpenAxiom {
+
 OPENAXIOM_C_EXPORT int
 addtopath(char *dir)
 {
@@ -741,19 +743,19 @@ quiet_double_NaN(void)
 }
 
 
-OPENAXIOM_C_EXPORT openaxiom_byteorder
+OPENAXIOM_C_EXPORT Byteorder
 oa_get_host_byteorder(void)
 {
 #ifdef WORDS_BIGENDIAN
-   return oa_big_endian;
+   return big_endian;
 #else
-   return oa_little_endian;
+   return little_endian;
 #endif   
 }
 
 
 OPENAXIOM_C_EXPORT void
-oa_allocate_process_argv(openaxiom_process* proc, int argc)
+oa_allocate_process_argv(Process* proc, int argc)
 {
    proc->argc = argc;
    proc->argv = (char**) malloc((1 + argc) * sizeof (char*));
@@ -761,7 +763,7 @@ oa_allocate_process_argv(openaxiom_process* proc, int argc)
 }
 
 OPENAXIOM_C_EXPORT int
-oa_spawn(openaxiom_process* proc, openaxiom_spawn_flags flags)
+oa_spawn(Process* proc, SpawnFlags flags)
 {
 #ifdef __WIN32__
    const char* path = NULL;
@@ -812,16 +814,16 @@ oa_spawn(openaxiom_process* proc, openaxiom_spawn_flags flags)
 
 #else
    proc->id = 0;
-   if ((flags & openaxiom_spawn_replace) == 0)
+   if ((flags & spawn_replace) == 0)
       proc->id = fork();
    if (proc->id == 0) {
-      if (flags & openaxiom_spawn_search_path)
+      if (flags & spawn_search_path)
          execvp(proc->argv[0], proc->argv);
       else
          execv(proc->argv[0], proc->argv);
       perror(strerror(errno));
       /* Don't keep useless clones around.  */
-      if ((flags & openaxiom_spawn_replace) == 0)
+      if ((flags & spawn_replace) == 0)
          exit(-1);
    }
    return proc->id;
@@ -874,3 +876,4 @@ oa_split(const char* sequence, const char* delimiter, int* size)
    return tokens; 
 }
 
+}
-- 
cgit v1.2.3