svn commit: samba r15375 - in branches/SAMBA_4_0/source: build/smb_build client lib/registry/tools lib/replace

[jelmer at samba.org]

Author: jelmer
Date: 2006-05-01 13:20:05 +0000 (Mon, 01 May 2006)
New Revision: 15375

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15375

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

Added:
   branches/SAMBA_4_0/source/lib/replace/smbreadline.h
Removed:
   branches/SAMBA_4_0/source/lib/replace/readline.h
Modified:
   branches/SAMBA_4_0/source/build/smb_build/header.pm
   branches/SAMBA_4_0/source/client/client.c
   branches/SAMBA_4_0/source/lib/registry/tools/regshell.c


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/header.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/header.pm	2006-05-01 13:06:39 UTC (rev 15374)
+++ branches/SAMBA_4_0/source/build/smb_build/header.pm	2006-05-01 13:20:05 UTC (rev 15375)
@@ -35,8 +35,10 @@
 			 	 $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";

Modified: branches/SAMBA_4_0/source/client/client.c
===================================================================
--- branches/SAMBA_4_0/source/client/client.c	2006-05-01 13:06:39 UTC (rev 15374)
+++ branches/SAMBA_4_0/source/client/client.c	2006-05-01 13:20:05 UTC (rev 15375)
@@ -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;

Modified: branches/SAMBA_4_0/source/lib/registry/tools/regshell.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/tools/regshell.c	2006-05-01 13:06:39 UTC (rev 15374)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regshell.c	2006-05-01 13:20:05 UTC (rev 15375)
@@ -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"
 
 /* 

Deleted: branches/SAMBA_4_0/source/lib/replace/readline.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/readline.h	2006-05-01 13:06:39 UTC (rev 15374)
+++ branches/SAMBA_4_0/source/lib/replace/readline.h	2006-05-01 13:20:05 UTC (rev 15375)
@@ -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__ */

Copied: branches/SAMBA_4_0/source/lib/replace/smbreadline.h (from rev 15371, branches/SAMBA_4_0/source/lib/replace/readline.h)