diff options
| author | kremlin <ian@kremlin.cc> | 2014-06-26 10:16:18 +0800 |
|---|---|---|
| committer | kremlin <ian@kremlin.cc> | 2014-06-26 10:16:18 +0800 |
| commit | 446ae274212d67709f0079bef602cac4e9e07a4a (patch) | |
| tree | 60ed7972e3274d96ca4e29a971e3af855c800496 | |
| parent | 8f18585d9b77a7e006f74fd94be74e014c791843 (diff) | |
| download | systembsd-446ae274212d67709f0079bef602cac4e9e07a4a.tar systembsd-446ae274212d67709f0079bef602cac4e9e07a4a.tar.gz systembsd-446ae274212d67709f0079bef602cac4e9e07a4a.tar.bz2 systembsd-446ae274212d67709f0079bef602cac4e9e07a4a.tar.lz systembsd-446ae274212d67709f0079bef602cac4e9e07a4a.tar.xz systembsd-446ae274212d67709f0079bef602cac4e9e07a4a.tar.zst systembsd-446ae274212d67709f0079bef602cac4e9e07a4a.zip | |
fix up merge conflicts to compile on strict settings
| -rw-r--r-- | src/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/config.c b/src/config.c index 54003fa..2d76106 100644 --- a/src/config.c +++ b/src/config.c @@ -122,6 +122,7 @@ gboolean config_init() { g_printf("could not read config at %s! exiting..", config_path); return FALSE; } +} gboolean init_xml() { @@ -148,10 +149,9 @@ gboolean init_xml() { } //set_xml_descriptors(); - return TRUE; //kill me! } } -} + //LEFTOFF /* gchar *posix_hostname; @@ -195,7 +195,7 @@ gboolean init_xml() { return TRUE; } */ -/*static void set_xml_descriptors() { +static void set_xml_descriptors() { } @@ -205,4 +205,4 @@ void clean_config() { g_free(config); g_free(data_dir); g_close(config_descr, NULL); -}*/ +} |