r25555: Remove support for BOOL, True and False.

(This used to be commit 18a2bcfa9e7d4718648f401821259d1dbf5a3ff4)

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 93527b564b0a6c9ef92231e71589264678aeb31e..1a92e4665718749a11290bb92055a90e4a2856e0 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -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 */

diff --git a/source4/script/mkproto.pl b/source4/script/mkproto.pl
index 6d76b9bc4f0e7638fdfc02ae610490e9ee494c30..f1c2cf9d0e8294bdcfce8415b20f00554464acda 100755 (executable)
--- a/source4/script/mkproto.pl
+++ b/source4/script/mkproto.pl
@@ -133,7 +133,6 @@ sub handle_loadparm($$)
 
                my %tmap = (
                            "BOOL" => "bool ",
-                               "bool" => "bool ",
                            "CONST_STRING" => "const char *",
                            "STRING" => "const char *",
                            "INTEGER" => "int ",
@@ -199,7 +198,7 @@ sub process_file($$$)
 
                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 @@ sub process_file($$$)
 
                $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 @@ sub process_file($$$)
                $target->($line);
 
                while ($line = <FH>) {
-                       $line =~ s/BOOL /bool /g;
                        if ($line =~ /\)\s*$/o) {
                                chomp $line;
                                $target->("$line;\n");