Blob Blame History Raw
--- libgnomevfs/gnome-vfs-handle.c.orig	2005-03-07 20:34:58.000000000 -0500
+++ libgnomevfs/gnome-vfs-handle.c	2005-03-07 20:40:01.000000000 -0500
@@ -129,6 +129,8 @@ _gnome_vfs_handle_do_read (GnomeVFSHandl
 			  GnomeVFSFileSize *bytes_read,
 			  GnomeVFSContext *context)
 {
+/* workaround to build to build with gcc 4.0 */
+#undef read
 	INVOKE_AND_RETURN (handle, read, (handle->uri->method, handle->method_handle,
 					  buffer, num_bytes, bytes_read,
 					  context));
--- modules/translate-method.c.orig	2005-03-07 21:05:39.000000000 -0500
+++ modules/translate-method.c	2005-03-07 21:06:25.000000000 -0500
@@ -572,6 +572,7 @@
 	   GnomeVFSFileSize * bytes_read_return, GnomeVFSContext * context)
 {
 	TranslateMethod *tm = (TranslateMethod *) method;
+#undef read
 	return tm->real_method->read(tm->real_method, method_handle,
 				     buffer, num_bytes, bytes_read_return,
 				     context);
--- modules/smb-method.c.orig	2005-03-07 21:11:06.000000000 -0500
+++ modules/smb-method.c	2005-03-07 21:07:14.000000000 -0500
@@ -1433,6 +1433,7 @@
 		
 		/* Important: perform_authentication leaves and re-enters the lock! */
 		while (perform_authentication (&actx) > 0) {
+#undef read
 			n = smb_context->read (smb_context, handle->file, buffer, num_bytes);
 			actx.res = (n >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno ();
 		}