Use solver to check for problems and produce a list of package transactions

[cygwin-apps/setup.git] / state.h

diff --git a/state.h b/state.h
index 3f107be978f62157bd57556b24732ad0a677c83d..6632d67a14bf4c5aa2066970bac1e0b712f1638a 100644 (file)
--- a/state.h
+++ b/state.h
@@ -13,6 +13,9 @@
  *
  */
 
+#ifndef SETUP_STATE_H
+#define SETUP_STATE_H
+
 /* The purpose of this file is to contain all the global variables
    that define the "state" of the install, that is, all the
    information that the user has provided so far.  These are set by
@@ -26,27 +29,19 @@
  
  */
 
-#include "String++.h"
+#include <string>
 
-extern bool unattended_mode;
+enum attend_mode { attended = 0, unattended, chooseronly };
+extern enum attend_mode unattended_mode;
+extern bool rebootneeded;
 
 extern int source;
 
-extern String local_dir;
+extern std::string local_dir;
 
 extern int root_text;
 extern int root_scope;
 extern int root_menu;
 extern int root_desktop;
 
-extern int net_method;
-extern char *net_proxy_host;
-extern int net_proxy_port;
-
-extern char *net_user;
-extern char *net_passwd;
-extern char *net_proxy_user;
-extern char *net_proxy_passwd;
-extern char *net_ftp_user;
-extern char *net_ftp_passwd;
-
+#endif /* SETUP_STATE_H */