gtk-doc r700 - in trunk: . tests/bugs/docs tests/bugs/src

[stefkost svn gnome org]

Author: stefkost
Date: Tue Mar 10 16:23:20 2009
New Revision: 700
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=700&view=rev

Log:
	patch by: Nicola Fontana <ntd entidi it>
	* gtkdoc-scan.in:
	* tests/bugs/docs/Makefile.am:
	* tests/bugs/src/tester.h:
	  Improve the test and fix handling trailing decorators. Fixes #574654



Modified:
   trunk/ChangeLog
   trunk/gtkdoc-scan.in
   trunk/tests/bugs/docs/Makefile.am
   trunk/tests/bugs/src/tester.h

Modified: trunk/gtkdoc-scan.in
==============================================================================
--- trunk/gtkdoc-scan.in	(original)
+++ trunk/gtkdoc-scan.in	Tue Mar 10 16:23:20 2009
@@ -592,7 +592,7 @@
 	# Note that sometimes functions end in ') G_GNUC_PRINTF (2, 3);' or
 	# ') __attribute__ (...);'.
 	if ($in_declaration eq 'function') {
-	    if ($decl =~ s/\)\s*(G_GNUC_.*|__attribute__\s*\(.*\)\s*)?;.*$//) {
+	    if ($decl =~ s/\)\s*(G_GNUC_.*|${IGNORE_DECORATORS}\s*|__attribute__\s*\(.*\)\s*)?;.*$//) {
 		$decl =~ s%/\*.*?\*/%%gs;	# remove comments.
 		#$decl =~ s/^\s+//;		# remove leading whitespace.
 		#$decl =~ s/\s+$//;		# remove trailing whitespace.

Modified: trunk/tests/bugs/docs/Makefile.am
==============================================================================
--- trunk/tests/bugs/docs/Makefile.am	(original)
+++ trunk/tests/bugs/docs/Makefile.am	Tue Mar 10 16:23:20 2009
@@ -19,7 +19,7 @@
 
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS=--deprecated-guards="GTKDOC_TESTER_DISABLE_DEPRECATED" \
-  --ignore-decorators="GLIB_VAR|G_GNUC_CONST" \
+  --ignore-decorators="GLIB_VAR|GTKDOC_GNUC_CONST" \
   2>&1 | tee gtkdoc-scan.log
 
 # Extra options to supply to gtkdoc-mkdb.

Modified: trunk/tests/bugs/src/tester.h
==============================================================================
--- trunk/tests/bugs/src/tester.h	(original)
+++ trunk/tests/bugs/src/tester.h	Tue Mar 10 16:23:20 2009
@@ -181,8 +181,9 @@
 struct _bug_554833 *
                 bug_554833_new (void);
 
+#define GTKDOC_GNUC_CONST
 
-int bug_574654a(void) G_GNUC_CONST;
+int bug_574654a(void) GTKDOC_GNUC_CONST;
 void bug_574654b(double offset);