diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-01 13:20:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:29 -0500 |
| commit | e595ede02fe9c80a88b5a7da4721c3c01808c276 (patch) | |
| tree | 8aa304d9b4c2702bb2928425afb3f0a812e6b042 /source4 | |
| parent | bd9e9062bff619e974cfc9bfb22f9b8dac8e8b80 (diff) | |
| download | samba-e595ede02fe9c80a88b5a7da4721c3c01808c276.tar.gz samba-e595ede02fe9c80a88b5a7da4721c3c01808c276.tar.bz2 samba-e595ede02fe9c80a88b5a7da4721c3c01808c276.zip | |
r15375: Rename readline.h to smbreadline.h avoid clashes with system header.
(This used to be commit ccc3d8a95441e7a7015f0cf0e622ec9e38347d33)
Diffstat (limited to 'source4')
| -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 |