From 873880edc2c432358abbf16158d02a7c5a20b3ff Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Sat, 17 Apr 2010 12:06:09 +0400
Subject: [PATCH] vfs_timeout and use_netrc variables were moved to vfs.h file.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---
 lib/vfs/mc-vfs/gc.h       | 7 +++----
 lib/vfs/mc-vfs/vfs-impl.h | 4 ----
 lib/vfs/mc-vfs/vfs.h      | 6 ++++++
 src/boxes.c               | 8 ++++----
 src/setup.c               | 7 ++-----
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/vfs/mc-vfs/gc.h b/lib/vfs/mc-vfs/gc.h
index f4f994664..99350e0be 100644
--- a/lib/vfs/mc-vfs/gc.h
+++ b/lib/vfs/mc-vfs/gc.h
@@ -9,15 +9,14 @@
 
 #include "vfs-impl.h"
 
-struct vfs_stamping {
+struct vfs_stamping
+{
     struct vfs_class *v;
     vfsid id;
     struct vfs_stamping *next;
     struct timeval time;
 };
 
-extern int vfs_timeout;
-
 void vfs_stamp (struct vfs_class *vclass, vfsid id);
 void vfs_rmstamp (struct vfs_class *vclass, vfsid id);
 void vfs_stamp_create (struct vfs_class *vclass, vfsid id);
@@ -29,4 +28,4 @@ void vfs_release_path (const char *dir);
 vfsid vfs_getid (struct vfs_class *vclass, const char *dir);
 void vfs_gc_done (void);
 
-#endif				/* __GC_H */
+#endif /* MC_VFS_GC_H */
diff --git a/lib/vfs/mc-vfs/vfs-impl.h b/lib/vfs/mc-vfs/vfs-impl.h
index 02e552017..1c8f1d444 100644
--- a/lib/vfs/mc-vfs/vfs-impl.h
+++ b/lib/vfs/mc-vfs/vfs-impl.h
@@ -135,10 +135,6 @@ void vfs_fill_names (fill_names_f);
 /* vfs/direntry.c: */
 void *vfs_s_open (struct vfs_class *, const char *, int, int);
 
-#ifdef USE_NETCODE
-extern int use_netrc;
-#endif
-
 void init_cpiofs (void);
 void init_extfs (void);
 void init_fish (void);
diff --git a/lib/vfs/mc-vfs/vfs.h b/lib/vfs/mc-vfs/vfs.h
index 0a9a52687..63c898070 100644
--- a/lib/vfs/mc-vfs/vfs.h
+++ b/lib/vfs/mc-vfs/vfs.h
@@ -18,6 +18,12 @@
 
 #ifdef ENABLE_VFS
 
+extern int vfs_timeout;
+
+#ifdef USE_NETCODE
+extern int use_netrc;
+#endif
+
 void vfs_init (void);
 void vfs_shut (void);
 
diff --git a/src/boxes.c b/src/boxes.c
index 2c1039d44..7ccb287d9 100644
--- a/src/boxes.c
+++ b/src/boxes.c
@@ -42,12 +42,12 @@
 #include "lib/mcconfig.h"	/* Load/save user formats */
 #include "lib/strutil.h"
 
-#ifdef USE_NETCODE
-#   include "lib/vfs/mc-vfs/ftpfs.h"
+#ifdef ENABLE_VFS
+#include "lib/vfs/mc-vfs/vfs.h" /* vfs_timeout */
 #endif
 
-#ifdef ENABLE_VFS
-#include "lib/vfs/mc-vfs/gc.h"
+#ifdef USE_NETCODE
+#   include "lib/vfs/mc-vfs/ftpfs.h"
 #endif
 
 #include "dialog.h"		/* The nice dialog manager */
diff --git a/src/setup.c b/src/setup.c
index 7ad8444df..556af5747 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -36,16 +36,13 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/mcconfig.h"
 #include "lib/fileloc.h"
-
-#ifdef ENABLE_VFS
-#include "lib/vfs/mc-vfs/gc.h"
-#endif
+#include "lib/strutil.h"        /* str_isutf8 () */
 
 #ifdef USE_NETCODE
 #   include "lib/vfs/mc-vfs/ftpfs.h"
 #   include "lib/vfs/mc-vfs/fish.h"
 #endif
-#include "lib/strutil.h"        /* str_isutf8 () */
+
 
 #include "args.h"
 #include "dir.h"
-- 
2.11.4.GIT