From 21bfde8acfea75dd6d94220263ae4a390f216f0c Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Fri, 15 Nov 2002 17:02:44 +0000
Subject: [PATCH] Minor warning fixes.

---
 vfs/samba/include/charset.h | 6 +++---
 vfs/samba/include/proto.h   | 3 ---
 vfs/samba/lib/util.c        | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/vfs/samba/include/charset.h b/vfs/samba/include/charset.h
index b6f79c03d..843ca87fb 100644
--- a/vfs/samba/include/charset.h
+++ b/vfs/samba/include/charset.h
@@ -19,13 +19,13 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+extern void charset_initialise(void);
+
 #ifndef CHARSET_C
 
 extern char *dos_char_map;
 extern char *upper_char_map;
 extern char *lower_char_map;
-extern void add_char_string(char *s);
-extern void charset_initialise(void);
 
 #ifdef toupper
 #undef toupper
@@ -61,7 +61,7 @@ extern void charset_initialise(void);
 /* this is used to determine if a character is safe to use in
    something that may be put on a command line */
 #define issafe(c) (isalnum((c&0xff)) || strchr("-._",c))
-#endif
+#endif		/* !CHARSET_C */
 
 /* Dynamic codepage files defines. */
 
diff --git a/vfs/samba/include/proto.h b/vfs/samba/include/proto.h
index f3870be17..aa7d408fe 100644
--- a/vfs/samba/include/proto.h
+++ b/vfs/samba/include/proto.h
@@ -39,7 +39,6 @@ void interpret_character_set(char *str);
 
 /*The following definitions come from  lib/charset.c  */
 
-void charset_initialise(void);
 void codepage_initialise(int client_codepage);
 void add_char_string(char *s);
 
@@ -149,7 +148,6 @@ int smbrun(char *cmd,char *outfile,BOOL shared);
 
 /*The following definitions come from  lib/system.c  */
 
-int sys_select(int maxfd, fd_set *fds,struct timeval *tval);
 int sys_select(int maxfd, fd_set *fds,struct timeval *tval);
 int sys_usleep(long usecs);
 int sys_stat(const char *fname,SMB_STRUCT_STAT *sbuf);
@@ -1956,7 +1954,6 @@ void process_blocking_lock_queue(time_t t);
 
 /*The following definitions come from  smbd/chgpasswd.c  */
 
-BOOL chgpasswd(char *name,char *oldpass,char *newpass, BOOL as_root);
 BOOL chgpasswd(char *name,char *oldpass,char *newpass, BOOL as_root);
 BOOL check_lanman_password(char *user, uchar *pass1, 
                            uchar *pass2, struct smb_passwd **psmbpw);
diff --git a/vfs/samba/lib/util.c b/vfs/samba/lib/util.c
index a336a3e03..47deff99a 100644
--- a/vfs/samba/lib/util.c
+++ b/vfs/samba/lib/util.c
@@ -2538,7 +2538,7 @@ routine to do file locking
 ****************************************************************************/
 BOOL fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
 {
-#if HAVE_FCNTL_LOCK
+#ifdef HAVE_FCNTL_LOCK
   SMB_STRUCT_FLOCK lock;
   int ret;