r15375: Rename readline.h to smbreadline.h avoid clashes with system header.

(This used to be commit ccc3d8a95441e7a7015f0cf0e622ec9e38347d33)

diff --git a/source4/build/smb_build/header.pm b/source4/build/smb_build/header.pm
index 7a0e40fda5d994928ef331b1fd990f8a8e536aa6..34e81a3a24ddeac89c69e23dadbe2de7e8d36829 100644 (file)
--- a/source4/build/smb_build/header.pm
+++ b/source4/build/smb_build/header.pm
@@ -35,8 +35,10 @@ sub _prepare_build_h($)
                                 $key->{TYPE} ne "BINARY");
                next unless defined($key->{INIT_FUNCTIONS});
 
+               my $name = $key->{NAME};
+               $name =~ s/-/_/g;
                $DEFINE->{COMMENT} = "$key->{TYPE} $key->{NAME} INIT";
-               $DEFINE->{KEY} = "STATIC_$key->{NAME}_MODULES";
+               $DEFINE->{KEY} = "STATIC_$name\_MODULES";
                $DEFINE->{VAL} = "{ \\\n";
                foreach (@{$key->{INIT_FUNCTIONS}}) {
                        $DEFINE->{VAL} .= "\t$_, \\\n";

diff --git a/source4/client/client.c b/source4/client/client.c
index a17ce8e686810ca7df364d81f2722724ccfe599d..a90e597b0b415c184eaae9f12558f44a608b8afa 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -38,7 +38,7 @@
 #include "system/time.h" /* needed by some systems for asctime() */
 #include "libcli/resolve/resolve.h"
 #include "libcli/security/security.h"
-#include "lib/replace/readline.h"
+#include "lib/replace/smbreadline.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 static int io_bufsize = 64512;

diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index dc8ff7723fea8bd301d7aa583199fd29623e7832..6da64d14a8e50f27adaed1a008edd03766f2a7ef 100644 (file)
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -25,7 +25,7 @@
 #include "lib/events/events.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
-#include "lib/replace/readline.h"
+#include "lib/replace/smbreadline.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 /* 

diff --git a/source4/lib/replace/readline.h b/source4/lib/replace/smbreadline.h
similarity index 100%
rename from source4/lib/replace/readline.h
rename to source4/lib/replace/smbreadline.h