diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-03-18 16:56:14 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-03-18 16:56:14 +0100 |
| commit | 9f6bfcaf9985dd9f6911c95b5df95e1d72a63f0f (patch) | |
| tree | 2a9984e56e95b822d38d638f12659944c86de0fe /src/search.cpp | |
| parent | 9886eaf7fd5170bb037df177848c6b5c7df745c2 (diff) | |
| download | sciteco-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/search.cpp')
| -rw-r--r-- | src/search.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/search.cpp b/src/search.cpp index de16b4f..7562096 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -250,7 +250,7 @@ StateSearch::pattern2regexp(const gchar *&pattern, temp = class2regexp(state, pattern); if (temp) { - new_re = g_strconcat(re ? : "", "[", temp, "]", NULL); + new_re = g_strconcat(re ? : "", "[", temp, "]", NIL); g_free(temp); g_free(re); re = new_re; @@ -275,7 +275,7 @@ StateSearch::pattern2regexp(const gchar *&pattern, temp = class2regexp(state, pattern, true); if (!temp) goto error; - new_re = g_strconcat(re ? : "", "[^", temp, "]", NULL); + new_re = g_strconcat(re ? : "", "[^", temp, "]", NIL); g_free(temp); g_free(re); re = new_re; @@ -303,7 +303,7 @@ StateSearch::pattern2regexp(const gchar *&pattern, temp = pattern2regexp(pattern, true); if (!temp) goto error; - new_re = g_strconcat(re ? : "", "(", temp, ")+", NULL); + new_re = g_strconcat(re ? : "", "(", temp, ")+", NIL); g_free(temp); g_free(re); re = new_re; |