diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index a447d1cb7..3b7c29b54 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-01  Pavel Roskin  <proski@gnu.org>
+
+	* vfs.h [!USE_VFS]: Define macros with no effect to an empty
+	statement "do { } while (0)".
+
 2001-09-30  Pavel Roskin  <proski@gnu.org>
 
 	* samba/acconfig.h: Only leave symbols required by Autoconf-2.52.
diff --git a/vfs/vfs.h b/vfs/vfs.h
index e47a11886..9ba2fccbb 100644
--- a/vfs/vfs.h
+++ b/vfs/vfs.h
@@ -251,8 +251,8 @@ struct utimbuf {
 
 #    undef USE_NETCODE
 
-#   define vfs_fill_names(x)
-#   define vfs_add_current_stamps()
+#   define vfs_fill_names(x) do { } while (0)
+#   define vfs_add_current_stamps() do { } while (0)
 #   define vfs_current_is_local() 1
 #   define vfs_file_is_local(x) 1
 #   define vfs_file_is_ftp(x) 0
@@ -303,21 +303,21 @@ struct utimbuf {
 #   define mc_rmdir rmdir
 #   define is_special_prefix(x) 0
 #   define vfs_type(x) (vfs *)(NULL)
-#   define vfs_init()
-#   define vfs_shut()
+#   define vfs_init() do { } while (0)
+#   define vfs_shut() do { } while (0)
 #   define vfs_canon(p) g_strdup (canonicalize_pathname(p))
-#   define vfs_free_resources()
-#   define vfs_timeout_handler()
+#   define vfs_free_resources() do { } while (0)
+#   define vfs_timeout_handler() do { } while (0)
 #   define vfs_timeouts() 0
-#   define vfs_force_expire()
+#   define vfs_force_expire() do { } while (0)
 
     typedef int vfs;
     
 #   define mc_getlocalcopy(x) NULL
-#   define mc_ungetlocalcopy(x,y,z) 0
+#   define mc_ungetlocalcopy(x,y,z) do { } while (0)
 
-#   define ftpfs_hint_reread(x) 
-#   define ftpfs_flushdir()
+#   define ftpfs_hint_reread(x) do { } while (0)
+#   define ftpfs_flushdir() do { } while (0)
 
 #ifdef _OS_NT
 #   undef mc_rmdir