From e595ede02fe9c80a88b5a7da4721c3c01808c276 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 1 May 2006 13:20:05 +0000 Subject: r15375: Rename readline.h to smbreadline.h avoid clashes with system header. (This used to be commit ccc3d8a95441e7a7015f0cf0e622ec9e38347d33) --- source4/build/smb_build/header.pm | 4 +++- source4/client/client.c | 2 +- source4/lib/registry/tools/regshell.c | 2 +- source4/lib/replace/readline.h | 9 --------- source4/lib/replace/smbreadline.h | 9 +++++++++ 5 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 source4/lib/replace/readline.h create mode 100644 source4/lib/replace/smbreadline.h (limited to 'source4') 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/readline.h deleted file mode 100644 index cde2b47a24..0000000000 --- a/source4/lib/replace/readline.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef __SMBREADLINE_H__ -#define __SMBREADLINE_H__ - -char *smb_readline(const char *prompt, void (*callback)(void), - char **(completion_fn)(const char *text, int start, int end)); -const char *smb_readline_get_line_buffer(void); -void smb_readline_ca_char(char c); - -#endif /* __SMBREADLINE_H__ */ diff --git a/source4/lib/replace/smbreadline.h b/source4/lib/replace/smbreadline.h new file mode 100644 index 0000000000..cde2b47a24 --- /dev/null +++ b/source4/lib/replace/smbreadline.h @@ -0,0 +1,9 @@ +#ifndef __SMBREADLINE_H__ +#define __SMBREADLINE_H__ + +char *smb_readline(const char *prompt, void (*callback)(void), + char **(completion_fn)(const char *text, int start, int end)); +const char *smb_readline_get_line_buffer(void); +void smb_readline_ca_char(char c); + +#endif /* __SMBREADLINE_H__ */ -- cgit