1 files changed, 27 insertions, 25 deletions

diff --git a/src/driver/utils.h b/src/driver/utils.h
index 8f56ba45..4f973973 100644
--- a/src/driver/utils.h
+++ b/src/driver/utils.h
@@ -42,45 +42,47 @@
 #  include <windows.h>
 #endif
 
+namespace OpenAxiom {
+
 /* A list of drivers for OpenAxiom.  */
-enum openaxiom_driver {
-   openaxiom_unknown_driver,    /* unknown driver */
-   openaxiom_null_driver,       /* do nothing */
-   openaxiom_config_driver,     /* print out configuration information */
-   openaxiom_sman_driver,       /* start Superman as master process */
-   openaxiom_core_driver,       /* start the core system as master process */
-   openaxiom_script_driver,     /* start the core system in script mode. */
-   openaxiom_compiler_driver,   /* start the core system in compiler mode. */
-   openaxiom_execute_driver     /* Execute a command.  */
+enum Driver {
+   unknown_driver,    /* unknown driver */
+   null_driver,       /* do nothing */
+   config_driver,     /* print out configuration information */
+   sman_driver,       /* start Superman as master process */
+   core_driver,       /* start the core system as master process */
+   script_driver,     /* start the core system in script mode. */
+   compiler_driver,   /* start the core system in compiler mode. */
+   execute_driver     /* Execute a command.  */
 };
 
 /* A list of runtime support systems for OpenAxiom. */
-enum openaxiom_runtime {
-   openaxiom_unknown_runtime,
-   openaxiom_gcl_runtime,       /* GCL-based runtime  */
-   openaxiom_sbcl_runtime,      /* SBCL-based runtime */
-   openaxiom_clisp_runtime,     /* CLISP-based runtime */
-   openaxiom_ecl_runtime,       /* ECL-based runtime */
-   openaxiom_clozure_runtime,   /* Clozure CL-based runtime */
-   openaxiom_bemol_runtime      /* Bemol-based runtime */
+enum Runtime {
+   unknown_runtime,
+   gcl_runtime,       /* GCL-based runtime  */
+   sbcl_runtime,      /* SBCL-based runtime */
+   clisp_runtime,     /* CLISP-based runtime */
+   ecl_runtime,       /* ECL-based runtime */
+   clozure_runtime,   /* Clozure CL-based runtime */
+   bemol_runtime      /* Bemol-based runtime */
 };
 
 /* A description of external command to be executed.  */
-struct openaxiom_command {
-   openaxiom_process core;      /* arguments for actual executable.  */
+struct Command {
+   Process core;      /* arguments for actual executable.  */
    char** rt_argv;              /* arguments to the base RT, if any.  */
    int rt_argc;                 /* number of such arguments.  */
    const char* root_dir;        /* path to the OpenAxiom system. */
 };
 
-const char* openaxiom_get_systemdir(int argc, char*[]);
-const char* openaxiom_make_path_for(const char*, openaxiom_driver);
+const char* get_systemdir(int argc, char*[]);
+const char* make_path_for(const char*, Driver);
 
-int openaxiom_execute_core(const openaxiom_command*, openaxiom_driver);
-void openaxiom_build_rts_options(openaxiom_command*, openaxiom_driver);
+int execute_core(const Command*, Driver);
+void build_rts_options(Command*, Driver);
 
-openaxiom_driver
-  openaxiom_preprocess_arguments(openaxiom_command*, int, char**);
+Driver preprocess_arguments(Command*, int, char**);
 
+}
 
 #endif /* OPENAXIOM_UTILS_INCLUDED */