From: David van Moolenbroek <david@minix3.org>
Date: Thu, 29 Jul 2010 21:16:23 +0000 (+0000)
Subject: put env_arg[cv] declaration in minix/sysutil.h
X-Git-Tag: v3.1.8~125
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=da597227ac293557d3987dab5b1301edce6abb3a;p=minix.git

put env_arg[cv] declaration in minix/sysutil.h
---

diff --git a/drivers/dec21140A/dec21140A.c b/drivers/dec21140A/dec21140A.c
index e8b0bdbb0..af008f14a 100644
--- a/drivers/dec21140A/dec21140A.c
+++ b/drivers/dec21140A/dec21140A.c
@@ -66,7 +66,6 @@ PRIVATE int de_instance;
 /* SEF functions and variables. */
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
 FORWARD _PROTOTYPE( int sef_cb_init_fresh, (int type, sef_init_info_t *info) );
-EXTERN char **env_argv;
 
 /*===========================================================================*
  *				main					     *
diff --git a/drivers/dp8390/dp8390.c b/drivers/dp8390/dp8390.c
index 78803c5d8..e78de5489 100644
--- a/drivers/dp8390/dp8390.c
+++ b/drivers/dp8390/dp8390.c
@@ -134,8 +134,6 @@ _PROTOTYPE( static void do_vir_outsw, (port_t port, int proc,
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
 FORWARD _PROTOTYPE( int sef_cb_init_fresh, (int type, sef_init_info_t *info) );
 FORWARD _PROTOTYPE( void sef_cb_signal_handler, (int signo) );
-EXTERN int env_argc;
-EXTERN char **env_argv;
 
 PRIVATE void handle_hw_intr(void)
 {
diff --git a/drivers/dpeth/dp.c b/drivers/dpeth/dp.c
index 01ca7653a..e790aab83 100644
--- a/drivers/dpeth/dp.c
+++ b/drivers/dpeth/dp.c
@@ -491,7 +491,6 @@ PRIVATE void handle_hw_intr(void)
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
 FORWARD _PROTOTYPE( int sef_cb_init_fresh, (int type, sef_init_info_t *info) );
 FORWARD _PROTOTYPE( void sef_cb_signal_handler, (int signo) );
-EXTERN char **env_argv;
 
 /*
 **  Name:	int dpeth_task(void)
diff --git a/drivers/e1000/e1000.c b/drivers/e1000/e1000.c
index 8c65b4191..90a171428 100644
--- a/drivers/e1000/e1000.c
+++ b/drivers/e1000/e1000.c
@@ -63,8 +63,6 @@ _PROTOTYPE( PRIVATE void mess_reply, (message *req, message *reply)	);
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
 FORWARD _PROTOTYPE( int sef_cb_init_fresh, (int type, sef_init_info_t *info) );
 FORWARD _PROTOTYPE( void sef_cb_signal_handler, (int signo) );
-EXTERN int env_argc;
-EXTERN char **env_argv;
 
 /*===========================================================================*
  *				main					     *
diff --git a/drivers/filter/main.c b/drivers/filter/main.c
index 4c588d556..c808325cf 100644
--- a/drivers/filter/main.c
+++ b/drivers/filter/main.c
@@ -77,8 +77,6 @@ static char *buf_array, *buffer;		/* contiguous buffer */
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
 FORWARD _PROTOTYPE( int sef_cb_init_fresh, (int type, sef_init_info_t *info) );
 FORWARD _PROTOTYPE( void sef_cb_signal_handler, (int signo) );
-EXTERN int env_argc;
-EXTERN char **env_argv;
 
 /*===========================================================================*
  *				carry					     *
diff --git a/drivers/fxp/fxp.c b/drivers/fxp/fxp.c
index 544ba53bc..02a3bc2ea 100644
--- a/drivers/fxp/fxp.c
+++ b/drivers/fxp/fxp.c
@@ -231,8 +231,6 @@ PRIVATE void handle_hw_intr(void)
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
 FORWARD _PROTOTYPE( int sef_cb_init_fresh, (int type, sef_init_info_t *info) );
 FORWARD _PROTOTYPE( void sef_cb_signal_handler, (int signo) );
-EXTERN int env_argc;
-EXTERN char **env_argv;
 
 /*===========================================================================*
  *				main					     *
diff --git a/drivers/lance/lance.c b/drivers/lance/lance.c
index 4af5a7c2e..82ae70866 100644
--- a/drivers/lance/lance.c
+++ b/drivers/lance/lance.c
@@ -265,7 +265,6 @@ phys_bytes lance_buf_phys;
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
 FORWARD _PROTOTYPE( int sef_cb_init_fresh, (int type, sef_init_info_t *info) );
 FORWARD _PROTOTYPE( void sef_cb_signal_handler, (int signo) );
-EXTERN char **env_argv;
 
 /*===========================================================================*
  *                              main                                         *
diff --git a/drivers/orinoco/orinoco.c b/drivers/orinoco/orinoco.c
index 43430493b..aca1a5a7a 100644
--- a/drivers/orinoco/orinoco.c
+++ b/drivers/orinoco/orinoco.c
@@ -180,7 +180,6 @@ PRIVATE u32_t system_hz;
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
 FORWARD _PROTOTYPE( int sef_cb_init_fresh, (int type, sef_init_info_t *info) );
 FORWARD _PROTOTYPE( void sef_cb_signal_handler, (int signo) );
-EXTERN char **env_argv;
 
 /*****************************************************************************
  *            main                                                           *
diff --git a/drivers/rtl8139/rtl8139.c b/drivers/rtl8139/rtl8139.c
index c7c182e74..ceac7aed8 100644
--- a/drivers/rtl8139/rtl8139.c
+++ b/drivers/rtl8139/rtl8139.c
@@ -141,8 +141,6 @@ FORWARD _PROTOTYPE( void sef_cb_signal_handler, (int signo) );
 EXTERN _PROTOTYPE( int sef_cb_lu_prepare, (int state) );
 EXTERN _PROTOTYPE( int sef_cb_lu_state_isvalid, (int state) );
 EXTERN _PROTOTYPE( void sef_cb_lu_state_dump, (int state) );
-EXTERN int env_argc;
-EXTERN char **env_argv;
 
 /*===========================================================================*
  *				main					     *
diff --git a/drivers/rtl8169/rtl8169.c b/drivers/rtl8169/rtl8169.c
index f802992db..036352f89 100644
--- a/drivers/rtl8169/rtl8169.c
+++ b/drivers/rtl8169/rtl8169.c
@@ -270,8 +270,6 @@ u32_t system_hz;
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
 FORWARD _PROTOTYPE( int sef_cb_init_fresh, (int type, sef_init_info_t *info) );
 FORWARD _PROTOTYPE( void sef_cb_signal_handler, (int signo) );
-EXTERN int env_argc;
-EXTERN char **env_argv;
 
 /*===========================================================================*
  *				main					     *
diff --git a/drivers/ti1225/ti1225.c b/drivers/ti1225/ti1225.c
index 81ef98ea3..dceae8aa2 100644
--- a/drivers/ti1225/ti1225.c
+++ b/drivers/ti1225/ti1225.c
@@ -60,8 +60,6 @@ FORWARD _PROTOTYPE( u8_t do_inb, (port_t port)				);
 /* SEF functions and variables. */
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
 FORWARD _PROTOTYPE( int sef_cb_init_fresh, (int type, sef_init_info_t *info) );
-EXTERN int env_argc;
-EXTERN char **env_argv;
 
 /*===========================================================================*
  *				main					     *
diff --git a/include/minix/sysutil.h b/include/minix/sysutil.h
index 477ce5db6..9316ec627 100644
--- a/include/minix/sysutil.h
+++ b/include/minix/sysutil.h
@@ -30,6 +30,9 @@
 #define EP_SET		3	/* var = 1:2:3 (nonblank field) */
 #define EP_EGETKENV	4	/* sys_getkenv() failed ... */
 
+extern int env_argc;
+extern char **env_argv;
+
 _PROTOTYPE( void env_setargs, (int argc, char *argv[])		        );
 _PROTOTYPE( int env_get_param, (char *key, char *value, int max_size)	);
 _PROTOTYPE( int env_prefix, (char *env, char *prefix)			);
diff --git a/servers/hgfs/main.c b/servers/hgfs/main.c
index 963dd471c..4826af342 100644
--- a/servers/hgfs/main.c
+++ b/servers/hgfs/main.c
@@ -33,8 +33,6 @@ PRIVATE struct optset optset_table[] = {
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
 FORWARD _PROTOTYPE( int sef_cb_init_fresh, (int type, sef_init_info_t *info) );
 FORWARD _PROTOTYPE( void sef_cb_signal_handler, (int signo) );
-EXTERN int env_argc;
-EXTERN char **env_argv;
 
 /*===========================================================================*
  *			      sef_cb_init_fresh				     *