summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-06 09:38:52 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-06 09:38:52 +0200
commit0855244f7ae75d89788c88015cca9c08fad3f39f (patch)
tree31bcd0be2e55049ef8f422ae06f8f6ca9c390c68 /src
parent13c942daa6c0b30cf853bf7cac34b2482cb6cd15 (diff)
parent862e48598a05c6e02c302f522f545d94599ba0bf (diff)
Merge tag 'upstream/3.16.0.1'
Upstream version 3.16.0.1
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in1
-rw-r--r--src/resources.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 0c0a632..25fe3a8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -184,7 +184,6 @@ COLORD_LIBS = @COLORD_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
diff --git a/src/resources.c b/src/resources.c
index 124a8cd..dac0374 100644
--- a/src/resources.c
+++ b/src/resources.c
@@ -6377,6 +6377,8 @@ GResource *simple_scan_get_resource (void)
*/
+#ifndef __GTK_DOC_IGNORE__
+
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
#define G_HAS_CONSTRUCTORS 1
@@ -6450,6 +6452,7 @@ GResource *simple_scan_get_resource (void)
#endif
+#endif /* __GTK_DOC_IGNORE__ */
#ifdef G_HAS_CONSTRUCTORS