Re: ximian-smb branch merged

[Christophe Fergeau <teuf users sourceforge net>]

I needed the attached patch to compile the new smb method. I have
already committed it since the build was broken without it (I'm using
gcc 2.95.4). I'm also getting warning about symbols being redefined, I
don't know if that's normal:

In file included from smb-method.c:55:
samba/include/config.h:875: warning: `PACKAGE_BUGREPORT' redefined
config.h:128: warning: this is the location of the previous definition
samba/include/config.h:878: warning: `PACKAGE_NAME' redefined
config.h:131: warning: this is the location of the previous definition
samba/include/config.h:881: warning: `PACKAGE_STRING' redefined
config.h:134: warning: this is the location of the previous definition
samba/include/config.h:884: warning: `PACKAGE_TARNAME' redefined
config.h:137: warning: this is the location of the previous definition
samba/include/config.h:887: warning: `PACKAGE_VERSION' redefined
config.h:140: warning: this is the location of the previous definition


I hope that's ok,

Christophe

? smbmethod.diff
? samba/autom4te.cache
? samba/po
? samba/include/config.h.in
Index: smb-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs-extras/smb-method.c,v
retrieving revision 1.31
diff -u -r1.31 smb-method.c
--- smb-method.c	12 Dec 2002 08:40:52 -0000	1.31
+++ smb-method.c	16 Dec 2002 10:46:14 -0000
@@ -919,6 +919,7 @@
 {
 	GnomeVFSResult result;
 	SmbConnection *host, *share;
+	SmbVirtualFileType type;
 
 	*data = NULL;
 
@@ -944,7 +945,7 @@
 
 	/* Host name or Workgroup */
 
-	SmbVirtualFileType type = SMB_VIRTUAL_TYPE_HOST;
+	type = SMB_VIRTUAL_TYPE_HOST;
 	
 	result = smb_host_connection (info, TRUE, FALSE, &host);
 	if (result != GNOME_VFS_OK) {