aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main.cpp
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2013-03-18 16:56:14 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2013-03-18 16:56:14 +0100
commit9f6bfcaf9985dd9f6911c95b5df95e1d72a63f0f (patch)
tree2a9984e56e95b822d38d638f12659944c86de0fe /src/main.cpp
parent9886eaf7fd5170bb037df177848c6b5c7df745c2 (diff)
downloadsciteco-9f6bfcaf9985dd9f6911c95b5df95e1d72a63f0f.tar.gz
make sure a (void*)0 is used as sentinels
since including glib.h on LLVM-Clang (32-bit) results in NULL being redefined to 0 and compiler warnings being emitted when NULL is used as sentinels
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index e0d573b..968b816 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -101,7 +101,7 @@ static inline gchar *
get_teco_ini(const gchar *program)
{
gchar *bin_dir = g_path_get_dirname(program);
- gchar *ini = g_build_filename(bin_dir, INI_FILE, NULL);
+ gchar *ini = g_build_filename(bin_dir, INI_FILE, NIL);
g_free(bin_dir);
return ini;
}
@@ -118,7 +118,7 @@ get_teco_ini(const gchar *program __attribute__((unused)))
#else
home = g_get_user_config_dir();
#endif
- return g_build_filename(home, INI_FILE, NULL);
+ return g_build_filename(home, INI_FILE, NIL);
}
#endif /* !G_OS_WIN32 */