[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdebindings/smoke
From:       Dirk Mueller <mueller () kde ! org>
Date:       2007-11-28 13:15:25
Message-ID: 1196255725.469400.16656.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 742646 by mueller:

only handle those #define that have no value. the others
are likely not feature enable/disable macros, and defining
them twice fails with gcc 4.3.


 M  +2 -2      kde/qtguess.pl.in  
 M  +2 -2      qt/qtguess.pl.in  


--- branches/KDE/3.5/kdebindings/smoke/kde/qtguess.pl.in #742645:742646
@@ -100,12 +100,12 @@
         {
 	    if( check_exit_status($?) )
 	    {
-		while( $symbols =~/^#\s*define\s*(QT_\S+)/gm )
+		while( $symbols =~/^#\s*define\s*(QT_\S+)\s*$/gm )
 		{
 			$qtdefs{$1} = 1;
 		}
 		print "Found ". scalar( keys %qtdefs )." predefined symbol".((scalar( keys %qtdefs \
                ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtdefs));
-		while( $symbols =~/^#\s*define\s*QT_MODULE_(\S+)/gm )
+		while( $symbols =~/^#\s*define\s*QT_MODULE_(\S+)\s*$/gm )
 		{
 			$qtundefs{"QT_NO_$1"} = 1;
 		}
--- branches/KDE/3.5/kdebindings/smoke/qt/qtguess.pl.in #742645:742646
@@ -100,12 +100,12 @@
         {
 	    if( check_exit_status($?) )
 	    {
-		while( $symbols =~/^#\s*define\s*(QT_\S+)/gm )
+		while( $symbols =~/^#\s*define\s*(QT_\S+)\s*$/gm )
 		{
 			$qtdefs{$1} = 1;
 		}
 		print "Found ". scalar( keys %qtdefs )." predefined symbol".((scalar( keys %qtdefs \
                ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtdefs));
-		while( $symbols =~/^#\s*define\s*QT_MODULE_(\S+)/gm )
+		while( $symbols =~/^#\s*define\s*QT_MODULE_(\S+)\s*$/gm )
 		{
 			$qtundefs{"QT_NO_$1"} = 1;
 		}


[prev in list] [next in list] [prev in thread] [next in thread]