Changeset 29181 in vbox for trunk/src/libs/xpcom18a4/xpcom

Timestamp:

May 7, 2010 12:02:15 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

61258

Message:

xpidl_java.c,Makefile.kmk: Mark the changes pertaining to making diffing easier with VBOX_XPIDL_EMULATE_GENJIFACES_DIFF. Corrected and cleaned up constant_declaration() - it now ends up with the right types.

File:

• trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_java.c (modified) (2 diffs)

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_java.c

@@ -869 +869 @@
 
     fputc('\n', state->file);
+#ifndef VBOX_XPIDL_EMULATE_GENJIFACES_DIFF
     xpidl_write_comment(state, 4);
-
-#ifdef VBOX_XPIDL_EMULATE_GENJIFACES /* (from typelib_const_dcl)*/
+#endif
+
+#ifdef VBOX_XPIDL_EMULATE_GENJIFACES
 # ifdef VBOX_XPIDL_EMULATE_GENJIFACES_DIFF
     fputs("  public static final ", state->file);
@@ -879 +881 @@
     if (IDL_TYPE_INTEGER(real_type).f_type == IDL_INTEGER_TYPE_LONG) {
         if (IDL_TYPE_INTEGER(real_type).f_signed)
-            fprintf(state->file, "int %s = %"   IDL_LL "d;\n",  name, IDL_INTEGER(dcl->const_exp).value);
+            fprintf(state->file, "int %s = %"   IDL_LL "d;\n",  name, IDL_INTEGER(declaration->const_exp).value);
         else
-            fprintf(state->file, "long %s = %"  IDL_LL "uL;\n", name, IDL_INTEGER(dcl->const_exp).value);
+            fprintf(state->file, "long %s = %"  IDL_LL "uL;\n", name, IDL_INTEGER(declaration->const_exp).value);
     } else {
         if (IDL_TYPE_INTEGER(real_type).f_signed)
-            fprintf(state->file, "short %s = %" IDL_LL "d;\n",  name, IDL_INTEGER(dcl->const_exp).value);
+            fprintf(state->file, "short %s = %" IDL_LL "d;\n",  name, IDL_INTEGER(declaration->const_exp).value);
         else
-            fprintf(state->file, "int %s = %"   IDL_LL "u;\n",  name, IDL_INTEGER(dcl->const_exp).value);
+            fprintf(state->file, "int %s = %"   IDL_LL "u;\n",  name, IDL_INTEGER(declaration->const_exp).value);
     }
 #else  /* !VBOX_XPIDL_EMULATE_GENJIFACES */