diff --git a/mozilla/java/xpcom/java/xpidl/xpidl_idl.c b/mozilla/java/xpcom/java/xpidl/xpidl_idl.c
index 4142f791e56..15078b4d520 100644
--- a/mozilla/java/xpcom/java/xpidl/xpidl_idl.c
+++ b/mozilla/java/xpcom/java/xpidl/xpidl_idl.c
@@ -665,7 +665,7 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path,
     state.dispatch = emitter->dispatch_table;
 
     if (strcmp(outname, "-")) {
-        // don't open file if the mode is "java"
+        /* don't open file if the mode is "java" */
         if (strcmp(mode->mode, "java")) {
             const char *fopen_mode;
             mode_outname = g_strdup_printf("%s.%s", outname, mode->suffix);
diff --git a/mozilla/java/xpcom/java/xpidl/xpidl_java.c b/mozilla/java/xpcom/java/xpidl/xpidl_java.c
index e66ad0b463d..f459e903597 100644
--- a/mozilla/java/xpcom/java/xpidl/xpidl_java.c
+++ b/mozilla/java/xpcom/java/xpidl/xpidl_java.c
@@ -428,7 +428,7 @@ xpcom_to_java_type (TreeState *state)
                     state->tree = orig_tree;
                 }
                 else {
-                    fputs(subscriptIdentifier(state, ident_str), FILENAME(state));
+                    fputs(subscriptIdentifier(state, (char*) ident_str), FILENAME(state));
                 }
             }
         }
@@ -730,7 +730,7 @@ constant_declaration(TreeState *state)
 
         fprintf(FILENAME(state), "    public static final %s %s = %d;\n",
                 (isshort ? "short" : "int"),
-                subscriptIdentifier(state, name),
+                subscriptIdentifier(state, (char*) name),
                 (int) IDL_INTEGER(declaration->const_exp).value);
     } else {
         XPIDL_WARNING((state->tree, IDL_WARNING1,
@@ -852,7 +852,7 @@ enum_declaration(TreeState *state)
 static gboolean
 module_declaration(TreeState *state)
 {
-    // do not use modules yet    
+    /* do not use modules yet */
 #if 0
     IDL_tree scope =
         IDL_tree_get_scope(state->tree);