summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/include/includes.h5
-rwxr-xr-xsource4/script/mkproto.pl5
2 files changed, 1 insertions, 9 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 93527b564b..1a92e46657 100644
--- 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 6d76b9bc4f..f1c2cf9d0e 100755
--- 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");