r15375: Rename readline.h to smbreadline.h avoid clashes with system header.
authorJelmer Vernooij <jelmer@samba.org>
Mon, 1 May 2006 13:20:05 +0000 (13:20 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:05:29 +0000 (14:05 -0500)
source/build/smb_build/header.pm
source/client/client.c
source/lib/registry/tools/regshell.c
source/lib/replace/smbreadline.h [moved from source/lib/replace/readline.h with 100% similarity]

index 7a0e40f..34e81a3 100644 (file)
@@ -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";
index a17ce8e..a90e597 100644 (file)
@@ -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;
index dc8ff77..6da64d1 100644 (file)
@@ -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"
 
 /*