* xfns.c (x_set_mouse_color): Recolor vertical_drag_cursor.

[gnu-emacs] / src / gfilenotify.c

diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 8f13c72df81d0dd7dd3751b9889cb90e16df5c43..9882f27d33a96cd8ab7f1cbe8bf776d3bda6df63 100644 (file)
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -1,5 +1,5 @@
 /* Filesystem notifications support with glib API.
-   Copyright (C) 2013 Free Software Foundation, Inc.
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -249,7 +249,9 @@ WATCH-DESCRIPTOR should be an object returned by `gfile-add-watch'.  */)
 void
 globals_of_gfilenotify (void)
 {
+#if ! GLIB_CHECK_VERSION (2, 36, 0)
   g_type_init ();
+#endif
   watch_list = Qnil;
 }