diff options
| -rw-r--r-- | source4/build/smb_build/header.pm | 4 | ||||
| -rw-r--r-- | source4/client/client.c | 2 | ||||
| -rw-r--r-- | source4/lib/registry/tools/regshell.c | 2 | ||||
| -rw-r--r-- | source4/lib/replace/smbreadline.h (renamed from source4/lib/replace/readline.h) | 0 |
4 files changed, 5 insertions, 3 deletions
diff --git a/source4/build/smb_build/header.pm b/source4/build/smb_build/header.pm index 7a0e40fda5..34e81a3a24 100644 --- 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 a17ce8e686..a90e597b0b 100644 --- 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 dc8ff7723f..6da64d14a8 100644 --- 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 index cde2b47a24..cde2b47a24 100644 --- a/source4/lib/replace/readline.h +++ b/source4/lib/replace/smbreadline.h |