svn commit: samba r25555 - in branches/SAMBA_4_0: . source/include source/script

[jelmer at samba.org]

Author: jelmer
Date: 2007-10-06 22:42:39 +0000 (Sat, 06 Oct 2007)
New Revision: 25555

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25555

Log:
Remove support for BOOL, True and False.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/script/mkproto.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2007-10-06 22:28:14 UTC (rev 25554)
+++ branches/SAMBA_4_0/source/include/includes.h	2007-10-06 22:42:39 UTC (rev 25555)
@@ -44,11 +44,6 @@
 #endif
 #include "util/util.h"
 
-typedef bool BOOL;
-
-#define False false
-#define True true
-
 #include "libcli/util/error.h"
 
 /* String routines */

Modified: branches/SAMBA_4_0/source/script/mkproto.pl
===================================================================
--- branches/SAMBA_4_0/source/script/mkproto.pl	2007-10-06 22:28:14 UTC (rev 25554)
+++ branches/SAMBA_4_0/source/script/mkproto.pl	2007-10-06 22:42:39 UTC (rev 25555)
@@ -133,7 +133,6 @@
 
 		my %tmap = (
 			    "BOOL" => "bool ",
-				"bool" => "bool ",
 			    "CONST_STRING" => "const char *",
 			    "STRING" => "const char *",
 			    "INTEGER" => "int ",
@@ -199,7 +198,7 @@
 
 		next unless ( $is_public || $line =~ /
 			      ^(_DEPRECATED_ |_NORETURN_ |_WARN_UNUSED_RESULT_ |_PURE_ )*(
-				  void|BOOL|bool|int|struct|char|const|\w+_[tT]\s|uint|unsigned|long|NTSTATUS|
+				  void|bool|int|struct|char|const|\w+_[tT]\s|uint|unsigned|long|NTSTATUS|
 				  ADS_STATUS|enum\s.*\(|DATA_BLOB|WERROR|XFILE|FILE|DIR|
 			      double|TDB_CONTEXT|TDB_DATA|TALLOC_CTX|NTTIME|FN_|init_module|
 			      GtkWidget|GType|smb_ucs2_t|krb5_error_code)
@@ -209,7 +208,6 @@
 
 		$target->("\n$comment") if (defined($comment)); $comment = undef;
 
-		$line =~ s/BOOL /bool /g;
 		if ( $line =~ /\(.*\)\s*$/o ) {
 			chomp $line;
 			$target->("$line;\n");
@@ -219,7 +217,6 @@
 		$target->($line);
 
 		while ($line = <FH>) {
-			$line =~ s/BOOL /bool /g;
 			if ($line =~ /\)\s*$/o) {
 				chomp $line;
 				$target->("$line;\n");