aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ring.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/ring.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/ring.cpp')
-rw-r--r--src/ring.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ring.cpp b/src/ring.cpp
index 1715559..c082381 100644
--- a/src/ring.cpp
+++ b/src/ring.cpp
@@ -349,7 +349,7 @@ make_savepoint(Buffer *buffer)
".teco-%s-%d", basename, buffer->savepoint_id);
g_free(basename);
dirname = g_path_get_dirname(buffer->filename);
- savepoint = g_build_filename(dirname, savepoint_basename, NULL);
+ savepoint = g_build_filename(dirname, savepoint_basename, NIL);
g_free(dirname);
if (!g_rename(buffer->filename, savepoint)) {
@@ -529,7 +529,7 @@ get_absolute_path(const gchar *path)
resolved = g_strdup(path);
} else {
gchar *cwd = g_get_current_dir();
- resolved = g_build_filename(cwd, path, NULL);
+ resolved = g_build_filename(cwd, path, NIL);
g_free(cwd);
}
} else {
@@ -690,7 +690,7 @@ StateEditFile::done(const gchar *str) throw (Error)
filename = g_build_filename(dirname,
basename,
- NULL);
+ NIL);
do_edit(filename);
g_free(filename);
}