aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@vega.ocn.ne.jp>2015-04-26 12:26:10 +0000
committerTatsuya Kinoshita <tats@vega.ocn.ne.jp>2015-04-26 12:26:10 +0000
commitc73206146657c05dd2bff7f3c0d4a6e6bc4d1d57 (patch)
tree0ef6ecc6d5908327bbdeb4d2f2cc87ec4b88100d
parentUpdate ChangeLog (diff)
parentfor gc-7.1 (diff)
downloadw3m-c73206146657c05dd2bff7f3c0d4a6e6bc4d1d57.tar.gz
w3m-c73206146657c05dd2bff7f3c0d4a6e6bc4d1d57.zip
Merge pull request #1 from yshl/gc-7.1
cannot built the master branch with gc-7.1
-rw-r--r--main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/main.c b/main.c
index d37b243..8f418ce 100644
--- a/main.c
+++ b/main.c
@@ -419,7 +419,11 @@ main(int argc, char **argv, char **envp)
char **getimage_args = NULL;
#endif /* defined(DONT_CALL_GC_AFTER_FORK) && defined(USE_IMAGE) */
GC_INIT();
+#if (GC_VERSION_MAJOR>=7) && (GC_VERSION_MINOR>=2)
GC_set_oom_fn(die_oom);
+#else
+ GC_oom_fn = die_oom;
+#endif
#if defined(ENABLE_NLS) || (defined(USE_M17N) && defined(HAVE_LANGINFO_CODESET))
setlocale(LC_ALL, "");
#endif