about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarco Peereboom <marco@conformal.com>2012-01-25 10:12:37 -0600
committerMarco Peereboom <marco@conformal.com>2012-01-25 10:12:37 -0600
commit5bb63a46cd629de6605d249844cc95b07d390739 (patch)
tree7bd1f2bac302c312ab46b711e526fb9004f926a6
parent5979003db6da483221f4a2802c2f9213f2cbc34d (diff)
downloadxombrero-5bb63a46cd629de6605d249844cc95b07d390739.tar.gz
I put PS in the wrong file, so move it so that stuff compiles again
-rw-r--r--xxxterm.c7
-rw-r--r--xxxterm.h5
2 files changed, 7 insertions, 5 deletions
diff --git a/xxxterm.c b/xxxterm.c
index 0665d06..a84aca5 100644
--- a/xxxterm.c
+++ b/xxxterm.c
@@ -81,9 +81,6 @@ struct command_entry {
 TAILQ_HEAD(command_list, command_entry);
 
 /* defines */
-#ifndef	PS
-#define PS			"/"
-#endif
 #define XT_DIR			(".xxxterm")
 #define XT_CACHE_DIR		("cache")
 #define XT_CERT_DIR		("certs")
@@ -227,7 +224,7 @@ void		marks_clear(struct tab *t);
 
 /* globals */
 extern char		*__progname;
-const char		**start_argv;
+char			* const *start_argv;
 struct passwd		*pwd;
 GtkWidget		*main_window;
 GtkNotebook		*notebook;
@@ -7324,7 +7321,7 @@ main(int argc, char **argv)
 	FILE			*f = NULL;
 	struct karg		a;
 
-	start_argv = (const char **)argv;
+	start_argv = (char * const *)argv;
 
 	/* prepare gtk */
 #ifdef USE_THREADS
diff --git a/xxxterm.h b/xxxterm.h
index 2a54118..24df35f 100644
--- a/xxxterm.h
+++ b/xxxterm.h
@@ -157,6 +157,11 @@ extern u_int32_t	swm_debug;
 
 #define XT_NOMARKS		(('z' - 'a' + 1) * 2 + 10)
 
+/* Path Separator */
+#ifndef	PS
+#define PS			"/"
+#endif
+
 struct tab {
 	TAILQ_ENTRY(tab)	entry;
 	GtkWidget		*vbox;