Index: compiler/header.h
===================================================================
--- compiler/header.h	(revision 439)
+++ compiler/header.h	(working copy)
@@ -286,9 +286,8 @@
     FILE * output_h;
     FILE * output_java;
     byte syntax_tree;
-    byte make_java;
-    byte make_c;
     byte widechars;
+    enum { LANG_JAVA, LANG_C } make_lang;
     char * externals_prefix;
     char * variables_prefix;
     char * runtime_path;
Index: compiler/driver.c
===================================================================
--- compiler/driver.c	(revision 439)
+++ compiler/driver.c	(working copy)
@@ -58,8 +58,7 @@
     o->variables_prefix = 0;
     o->runtime_path = 0;
     o->name = "";
-    o->make_c = true;
-    o->make_java = false;
+    o->make_lang = LANG_C;
     o->widechars = false;
     o->includes = 0;
     o->includes_end = 0;
@@ -82,9 +81,8 @@
             }
 #ifndef DISABLE_JAVA
             if (eq(s, "-j") || eq(s, "-java")) {
-                o->make_java = true;
+                o->make_lang = LANG_JAVA;
                 o->widechars = true;
-                o->make_c = false;
                 continue;
             }
 #endif
@@ -167,7 +165,7 @@
                     print_arglist();
                     exit(1);
                 }
-                if (o->make_c) {
+                if (o->make_lang == LANG_C) {
                     symbol * b = add_s_to_b(0, s);
                     b = add_s_to_b(b, ".c");
                     o->output_c = get_output(b);
@@ -182,7 +180,7 @@
                     fclose(o->output_h);
                 }
 #ifndef DISABLE_JAVA
-                if (o->make_java) {
+                if (o->make_lang == LANG_JAVA) {
                     symbol * b = add_s_to_b(0, s);
                     b = add_s_to_b(b, ".java");
                     o->output_java = get_output(b);