slight cleanup, and zwgcplus mode is on by default

1 files changed, 2 insertions, 8 deletions

diff --git a/zwgc/main.c b/zwgc/main.c
index 2ad8736..15ab264 100644
--- a/zwgc/main.c
+++ b/zwgc/main.c
@@ -48,7 +48,7 @@ static const char rcsid_main_c[] = "$Id$";
 #endif
 #ifdef CMU_ZWGCPLUS
 #include "plus.h"
-int zwgcplus = 0;
+int zwgcplus = 1;
 #endif
 
 void notice_handler(ZNotice_t *);
@@ -244,8 +244,7 @@ run_initprogs(void)
  */
 
 int
-main(int argc,
-     char **argv)
+main(int argc, char **argv)
 {
     char **new;
     register char **current;
@@ -333,11 +332,6 @@ main(int argc,
     dprintf("Test Zwgc parser.\n\n");
     read_in_description_file();
 
-#ifdef CMU_ZWGCPLUS
-    if (strcmp(progname, "zwgcplus") == 0)
-      zwgcplus = 1;
-#endif
-
     dprintf("Entering main loop\n");
     mux_loop();