1 files changed, 28 insertions, 36 deletions

diff --git a/src/include/cfuns.h b/src/include/cfuns.h
index 10f439d2..28e89d85 100644
--- a/src/include/cfuns.h
+++ b/src/include/cfuns.h
@@ -38,43 +38,35 @@
 
 #include "open-axiom.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif   
+OPENAXIOM_C_EXPORT int addtopath(char*);
+OPENAXIOM_C_EXPORT int directoryp(char*);
+OPENAXIOM_C_EXPORT int make_path_from_file(char*, char*);
+OPENAXIOM_C_EXPORT int writeablep(char*);
+OPENAXIOM_C_EXPORT int readablep(char*);
+OPENAXIOM_C_EXPORT long findString(char*, char*);
+OPENAXIOM_C_EXPORT int copyEnvValue(char*, char*);
+OPENAXIOM_C_EXPORT int oa_chdir(const char*);
+OPENAXIOM_C_EXPORT int oa_unlink(const char*);
+OPENAXIOM_C_EXPORT int oa_rename(const char*, const char*);
+OPENAXIOM_C_EXPORT int oa_mkdir(const char*);
+OPENAXIOM_C_EXPORT int oa_system(const char*);
+OPENAXIOM_C_EXPORT char* oa_getenv(const char*);
+OPENAXIOM_C_EXPORT int oa_setenv(const char*, const char*);
+OPENAXIOM_C_EXPORT int oa_getpid(void);
+OPENAXIOM_C_EXPORT char* oa_getcwd(void);
+OPENAXIOM_C_EXPORT int oa_access_file_for_read(const char*);
+OPENAXIOM_C_EXPORT char* oa_dirname(const char*);
+OPENAXIOM_C_EXPORT const char* oa_get_tmpdir(void);
+OPENAXIOM_C_EXPORT int oa_copy_file(const char*, const char*);
 
-OPENAXIOM_EXPORT int addtopath(char*);
-OPENAXIOM_EXPORT int directoryp(char*);
-OPENAXIOM_EXPORT int make_path_from_file(char*, char*);
-OPENAXIOM_EXPORT int writeablep(char*);
-OPENAXIOM_EXPORT int readablep(char*);
-OPENAXIOM_EXPORT long findString(char*, char*);
-OPENAXIOM_EXPORT int copyEnvValue(char*, char*);
-OPENAXIOM_EXPORT int oa_chdir(const char*);
-OPENAXIOM_EXPORT int oa_unlink(const char*);
-OPENAXIOM_EXPORT int oa_rename(const char*, const char*);
-OPENAXIOM_EXPORT int oa_mkdir(const char*);
-OPENAXIOM_EXPORT int oa_system(const char*);
-OPENAXIOM_EXPORT char* oa_getenv(const char*);
-OPENAXIOM_EXPORT int oa_setenv(const char*, const char*);
-OPENAXIOM_EXPORT int oa_getpid(void);
-OPENAXIOM_EXPORT char* oa_getcwd(void);
-OPENAXIOM_EXPORT int oa_access_file_for_read(const char*);
-OPENAXIOM_EXPORT char* oa_dirname(const char*);
-OPENAXIOM_EXPORT const char* oa_get_tmpdir(void);
-OPENAXIOM_EXPORT int oa_copy_file(const char*, const char*);
+OPENAXIOM_C_EXPORT double plus_infinity(void);
+OPENAXIOM_C_EXPORT double minus_infinity(void);
+OPENAXIOM_C_EXPORT double quiet_double_NaN(void);
+OPENAXIOM_C_EXPORT openaxiom_byteorder oa_get_host_byteorder(void);
 
-OPENAXIOM_EXPORT double plus_infinity(void);
-OPENAXIOM_EXPORT double minus_infinity(void);
-OPENAXIOM_EXPORT double quiet_double_NaN(void);
-OPENAXIOM_EXPORT openaxiom_byteorder oa_get_host_byteorder(void);
-
-OPENAXIOM_EXPORT const char* oa_concatenate_string(const char*, const char*);
-OPENAXIOM_EXPORT const char* oa_strcat(const char*, const char*);
-OPENAXIOM_EXPORT char* oa_substr(const char*, const size_t, const size_t);
-OPENAXIOM_EXPORT char** oa_split(const char*, const char*, int*);
-
-#ifdef __cplusplus
-}
-#endif   
+OPENAXIOM_C_EXPORT const char* oa_concatenate_string(const char*, const char*);
+OPENAXIOM_C_EXPORT const char* oa_strcat(const char*, const char*);
+OPENAXIOM_C_EXPORT char* oa_substr(const char*, const size_t, const size_t);
+OPENAXIOM_C_EXPORT char** oa_split(const char*, const char*, int*);
    
 #endif /* OPENAXIOM_CFUNS_included */