1 files changed, 135 insertions, 135 deletions

diff --git a/common/os_calls.h b/common/os_calls.h
index 6232b63b..4e93558d 100644
--- a/common/os_calls.h
+++ b/common/os_calls.h
@@ -37,149 +37,149 @@
 #define g_tcp_select g_sck_select
 #define g_close_wait_obj g_delete_wait_obj
 
-int APP_CC      g_rm_temp_dir(void);
-int APP_CC      g_mk_temp_dir(const char* app_name);
-void APP_CC     g_init(const char* app_name);
-void APP_CC     g_deinit(void);
-void* APP_CC    g_malloc(int size, int zero);
-void APP_CC     g_free(void* ptr);
-void DEFAULT_CC g_printf(const char *format, ...) printflike(1, 2);
-void DEFAULT_CC g_sprintf(char* dest, const char* format, ...) \
+int      g_rm_temp_dir(void);
+int      g_mk_temp_dir(const char* app_name);
+void     g_init(const char* app_name);
+void     g_deinit(void);
+void*    g_malloc(int size, int zero);
+void     g_free(void* ptr);
+void g_printf(const char *format, ...) printflike(1, 2);
+void g_sprintf(char* dest, const char* format, ...) \
                   printflike(2, 3);
-int DEFAULT_CC  g_snprintf(char* dest, int len, const char* format, ...) \
+int  g_snprintf(char* dest, int len, const char* format, ...) \
                   printflike(3, 4);
-void DEFAULT_CC g_writeln(const char* format, ...) printflike(1, 2);
-void DEFAULT_CC g_write(const char* format, ...) printflike(1, 2);
-void APP_CC     g_hexdump(const char *p, int len);
-void APP_CC     g_memset(void* ptr, int val, int size);
-void APP_CC     g_memcpy(void* d_ptr, const void* s_ptr, int size);
-int APP_CC      g_getchar(void);
-int APP_CC      g_tcp_set_no_delay(int sck);
-int APP_CC      g_tcp_set_keepalive(int sck);
-int APP_CC      g_tcp_socket(void);
-int APP_CC      g_sck_set_send_buffer_bytes(int sck, int bytes);
-int APP_CC      g_sck_get_send_buffer_bytes(int sck, int *bytes);
-int APP_CC      g_sck_set_recv_buffer_bytes(int sck, int bytes);
-int APP_CC      g_sck_get_recv_buffer_bytes(int sck, int *bytes);
-int APP_CC      g_sck_local_socket(void);
-int APP_CC      g_sck_get_peer_cred(int sck, int *pid, int *uid, int *gid);
-void APP_CC     g_sck_close(int sck);
-int APP_CC      g_tcp_connect(int sck, const char* address, const char* port);
-int APP_CC      g_sck_local_connect(int sck, const char* port);
-int APP_CC      g_sck_set_non_blocking(int sck);
-int APP_CC      g_tcp_bind(int sck, const char *port);
-int APP_CC      g_sck_local_bind(int sck, const char* port);
-int APP_CC      g_tcp_bind_address(int sck, const char* port, const char* address);
-int APP_CC      g_sck_listen(int sck);
-int APP_CC      g_tcp_accept(int sck);
-int APP_CC      g_sck_accept(int sck, char *addr, int addr_bytes,
+void g_writeln(const char* format, ...) printflike(1, 2);
+void g_write(const char* format, ...) printflike(1, 2);
+void     g_hexdump(const char *p, int len);
+void     g_memset(void* ptr, int val, int size);
+void     g_memcpy(void* d_ptr, const void* s_ptr, int size);
+int      g_getchar(void);
+int      g_tcp_set_no_delay(int sck);
+int      g_tcp_set_keepalive(int sck);
+int      g_tcp_socket(void);
+int      g_sck_set_send_buffer_bytes(int sck, int bytes);
+int      g_sck_get_send_buffer_bytes(int sck, int *bytes);
+int      g_sck_set_recv_buffer_bytes(int sck, int bytes);
+int      g_sck_get_recv_buffer_bytes(int sck, int *bytes);
+int      g_sck_local_socket(void);
+int      g_sck_get_peer_cred(int sck, int *pid, int *uid, int *gid);
+void     g_sck_close(int sck);
+int      g_tcp_connect(int sck, const char* address, const char* port);
+int      g_sck_local_connect(int sck, const char* port);
+int      g_sck_set_non_blocking(int sck);
+int      g_tcp_bind(int sck, const char *port);
+int      g_sck_local_bind(int sck, const char* port);
+int      g_tcp_bind_address(int sck, const char* port, const char* address);
+int      g_sck_listen(int sck);
+int      g_tcp_accept(int sck);
+int      g_sck_accept(int sck, char *addr, int addr_bytes,
                              char *port, int port_bytes);
-int APP_CC      g_sck_recv(int sck, void* ptr, int len, int flags);
-int APP_CC      g_sck_send(int sck, const void* ptr, int len, int flags);
-int APP_CC      g_sck_last_error_would_block(int sck);
-int APP_CC      g_sck_socket_ok(int sck);
-int APP_CC      g_sck_can_send(int sck, int millis);
-int APP_CC      g_sck_can_recv(int sck, int millis);
-int APP_CC      g_sck_select(int sck1, int sck2);
-void APP_CC     g_write_ip_address(int rcv_sck, char* ip_address, int bytes);
-void APP_CC     g_sleep(int msecs);
-tintptr APP_CC  g_create_wait_obj(const char *name);
-tintptr APP_CC  g_create_wait_obj_from_socket(tintptr socket, int write);
-void APP_CC     g_delete_wait_obj_from_socket(tintptr wait_obj);
-int APP_CC      g_set_wait_obj(tintptr obj);
-int APP_CC      g_reset_wait_obj(tintptr obj);
-int APP_CC      g_is_wait_obj_set(tintptr obj);
-int APP_CC      g_delete_wait_obj(tintptr obj);
-int APP_CC      g_obj_wait(tintptr* read_objs, int rcount, tintptr* write_objs,
+int      g_sck_recv(int sck, void* ptr, int len, int flags);
+int      g_sck_send(int sck, const void* ptr, int len, int flags);
+int      g_sck_last_error_would_block(int sck);
+int      g_sck_socket_ok(int sck);
+int      g_sck_can_send(int sck, int millis);
+int      g_sck_can_recv(int sck, int millis);
+int      g_sck_select(int sck1, int sck2);
+void     g_write_ip_address(int rcv_sck, char* ip_address, int bytes);
+void     g_sleep(int msecs);
+tintptr  g_create_wait_obj(const char *name);
+tintptr  g_create_wait_obj_from_socket(tintptr socket, int write);
+void     g_delete_wait_obj_from_socket(tintptr wait_obj);
+int      g_set_wait_obj(tintptr obj);
+int      g_reset_wait_obj(tintptr obj);
+int      g_is_wait_obj_set(tintptr obj);
+int      g_delete_wait_obj(tintptr obj);
+int      g_obj_wait(tintptr* read_objs, int rcount, tintptr* write_objs,
                            int wcount,int mstimeout);
-void APP_CC     g_random(char* data, int len);
-int APP_CC      g_abs(int i);
-int APP_CC      g_memcmp(const void* s1, const void* s2, int len);
-int APP_CC      g_file_open(const char* file_name);
-int APP_CC      g_file_open_ex(const char *file_name, int aread, int awrite,
+void     g_random(char* data, int len);
+int      g_abs(int i);
+int      g_memcmp(const void* s1, const void* s2, int len);
+int      g_file_open(const char* file_name);
+int      g_file_open_ex(const char *file_name, int aread, int awrite,
                                int acreate, int atrunc);
-int APP_CC      g_file_close(int fd);
-int APP_CC      g_file_read(int fd, char* ptr, int len);
-int APP_CC      g_file_write(int fd, const char *ptr, int len);
-int APP_CC      g_file_seek(int fd, int offset);
-int APP_CC      g_file_lock(int fd, int start, int len);
-int APP_CC      g_chmod_hex(const char* filename, int flags);
-int APP_CC      g_chown(const char* name, int uid, int gid);
-int APP_CC      g_mkdir(const char* dirname);
-char* APP_CC    g_get_current_dir(char* dirname, int maxlen);
-int APP_CC      g_set_current_dir(const char *dirname);
-int APP_CC      g_file_exist(const char* filename);
-int APP_CC      g_directory_exist(const char* dirname);
-int APP_CC      g_create_dir(const char* dirname);
-int APP_CC      g_create_path(const char* path);
-int APP_CC      g_remove_dir(const char* dirname);
-int APP_CC      g_file_delete(const char* filename);
-int APP_CC      g_file_get_size(const char* filename);
-int APP_CC      g_strlen(const char* text);
-const char *APP_CC g_strchr(const char *text, int c);
-char* APP_CC    g_strcpy(char* dest, const char* src);
-char* APP_CC    g_strncpy(char* dest, const char* src, int len);
-char* APP_CC    g_strcat(char* dest, const char* src);
-char* APP_CC    g_strdup(const char* in);
-char* APP_CC    g_strndup(const char* in, const unsigned int maxlen);
-int APP_CC      g_strcmp(const char* c1, const char* c2);
-int APP_CC      g_strncmp(const char* c1, const char* c2, int len);
-int APP_CC      g_strncmp_d(const char* c1, const char* c2, const char delim, int len);
-int APP_CC      g_strcasecmp(const char* c1, const char* c2);
-int APP_CC      g_strncasecmp(const char* c1, const char* c2, int len);
-int APP_CC      g_atoi(const char* str);
-int APP_CC      g_htoi(char* str);
-int APP_CC      g_bytes_to_hexstr(const void *bytes, int num_bytes, char *out_str,
+int      g_file_close(int fd);
+int      g_file_read(int fd, char* ptr, int len);
+int      g_file_write(int fd, const char *ptr, int len);
+int      g_file_seek(int fd, int offset);
+int      g_file_lock(int fd, int start, int len);
+int      g_chmod_hex(const char* filename, int flags);
+int      g_chown(const char* name, int uid, int gid);
+int      g_mkdir(const char* dirname);
+char*    g_get_current_dir(char* dirname, int maxlen);
+int      g_set_current_dir(const char *dirname);
+int      g_file_exist(const char* filename);
+int      g_directory_exist(const char* dirname);
+int      g_create_dir(const char* dirname);
+int      g_create_path(const char* path);
+int      g_remove_dir(const char* dirname);
+int      g_file_delete(const char* filename);
+int      g_file_get_size(const char* filename);
+int      g_strlen(const char* text);
+const char *g_strchr(const char *text, int c);
+char*    g_strcpy(char* dest, const char* src);
+char*    g_strncpy(char* dest, const char* src, int len);
+char*    g_strcat(char* dest, const char* src);
+char*    g_strdup(const char* in);
+char*    g_strndup(const char* in, const unsigned int maxlen);
+int      g_strcmp(const char* c1, const char* c2);
+int      g_strncmp(const char* c1, const char* c2, int len);
+int      g_strncmp_d(const char* c1, const char* c2, const char delim, int len);
+int      g_strcasecmp(const char* c1, const char* c2);
+int      g_strncasecmp(const char* c1, const char* c2, int len);
+int      g_atoi(const char* str);
+int      g_htoi(char* str);
+int      g_bytes_to_hexstr(const void *bytes, int num_bytes, char *out_str,
                                   int bytes_out_str);
-int APP_CC      g_pos(const char* str, const char* to_find);
-int APP_CC      g_mbstowcs(twchar* dest, const char* src, int n);
-int APP_CC      g_wcstombs(char* dest, const twchar* src, int n);
-int APP_CC      g_strtrim(char* str, int trim_flags);
-long APP_CC     g_load_library(char* in);
-int APP_CC      g_free_library(long lib);
-void* APP_CC    g_get_proc_address(long lib, const char* name);
-int APP_CC      g_system(char* aexec);
-char* APP_CC    g_get_strerror(void);
-int APP_CC      g_get_errno(void);
-int APP_CC      g_execvp(const char* p1, char* args[]);
-int APP_CC      g_execlp3(const char* a1, const char* a2, const char* a3);
-void APP_CC     g_signal_child_stop(void (*func)(int));
-void APP_CC     g_signal_segfault(void (*func)(int));
-void APP_CC     g_signal_hang_up(void (*func)(int));
-void APP_CC     g_signal_user_interrupt(void (*func)(int));
-void APP_CC     g_signal_terminate(void (*func)(int));
-void APP_CC     g_signal_pipe(void (*func)(int));
-void APP_CC     g_signal_usr1(void (*func)(int));
-int APP_CC      g_fork(void);
-int APP_CC      g_setgid(int pid);
-int APP_CC      g_initgroups(const char* user, int gid);
-int APP_CC      g_getuid(void);
-int APP_CC      g_getgid(void);
-int APP_CC      g_setuid(int pid);
-int APP_CC      g_setsid(void);
-int APP_CC      g_setlogin(const char *name);
-int APP_CC      g_waitchild(void);
-int APP_CC      g_waitpid(int pid);
-void APP_CC     g_clearenv(void);
-int APP_CC      g_setenv(const char* name, const char* value, int rewrite);
-char* APP_CC    g_getenv(const char* name);
-int APP_CC      g_exit(int exit_code);
-int APP_CC      g_getpid(void);
-int APP_CC      g_sigterm(int pid);
-int APP_CC      g_getuser_info(const char* username, int* gid, int* uid, char** shell,
+int      g_pos(const char* str, const char* to_find);
+int      g_mbstowcs(twchar* dest, const char* src, int n);
+int      g_wcstombs(char* dest, const twchar* src, int n);
+int      g_strtrim(char* str, int trim_flags);
+long     g_load_library(char* in);
+int      g_free_library(long lib);
+void*    g_get_proc_address(long lib, const char* name);
+int      g_system(char* aexec);
+char*    g_get_strerror(void);
+int      g_get_errno(void);
+int      g_execvp(const char* p1, char* args[]);
+int      g_execlp3(const char* a1, const char* a2, const char* a3);
+void     g_signal_child_stop(void (*func)(int));
+void     g_signal_segfault(void (*func)(int));
+void     g_signal_hang_up(void (*func)(int));
+void     g_signal_user_interrupt(void (*func)(int));
+void     g_signal_terminate(void (*func)(int));
+void     g_signal_pipe(void (*func)(int));
+void     g_signal_usr1(void (*func)(int));
+int      g_fork(void);
+int      g_setgid(int pid);
+int      g_initgroups(const char* user, int gid);
+int      g_getuid(void);
+int      g_getgid(void);
+int      g_setuid(int pid);
+int      g_setsid(void);
+int      g_setlogin(const char *name);
+int      g_waitchild(void);
+int      g_waitpid(int pid);
+void     g_clearenv(void);
+int      g_setenv(const char* name, const char* value, int rewrite);
+char*    g_getenv(const char* name);
+int      g_exit(int exit_code);
+int      g_getpid(void);
+int      g_sigterm(int pid);
+int      g_getuser_info(const char* username, int* gid, int* uid, char** shell,
                                char** dir, char** gecos);
-int APP_CC      g_getgroup_info(const char* groupname, int* gid);
-int APP_CC      g_check_user_in_group(const char* username, int gid, int* ok);
-int APP_CC      g_time1(void);
-int APP_CC      g_time2(void);
-int APP_CC      g_time3(void);
-int APP_CC      g_save_to_bmp(const char* filename, char* data, int stride_bytes,
+int      g_getgroup_info(const char* groupname, int* gid);
+int      g_check_user_in_group(const char* username, int gid, int* ok);
+int      g_time1(void);
+int      g_time2(void);
+int      g_time3(void);
+int      g_save_to_bmp(const char* filename, char* data, int stride_bytes,
                               int width, int height, int depth, int bits_per_pixel);
-int APP_CC      g_text2bool(const char *s);
-void * APP_CC   g_shmat(int shmid);
-int APP_CC      g_shmdt(const void *shmaddr);
-int APP_CC      g_gethostname(char *name, int len);
-int APP_CC      g_mirror_memcpy(void *dst, const void *src, int len);
+int      g_text2bool(const char *s);
+void *   g_shmat(int shmid);
+int      g_shmdt(const void *shmaddr);
+int      g_gethostname(char *name, int len);
+int      g_mirror_memcpy(void *dst, const void *src, int len);
 
 /* glib-style wrappers */
 #define g_new(struct_type, n_structs) \