Changeset 32229 in vbox

Timestamp:

Sep 3, 2010 7:38:52 AM (15 years ago)

Author:

vboxsync

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

65538

Message:

libs/xpcom: shut up a bunch of annoying warnings

Location:

trunk/src/libs/xpcom18a4

Files:

• java/Makefile.kmk (modified) (3 diffs)
• python/src/PyXPCOM.h (modified) (2 diffs)
• python/src/VariantUtils.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/java/Makefile.kmk

@@ -113 +113 @@
 #
 $(VBOX_JXPCOM_GENH): $$(VBOX_JXPCOM_JAR)
+        $(call MSG_L1,Generating $@ from $<)
         $(QUIET)$(VBOX_JAVAH) -classpath $(VBOX_JXPCOM_JDEST) -d $(VBOX_JXPCOM_JDEST) \
                 org.mozilla.xpcom.internal.XPCOMImpl \
@@ -125 +126 @@
 #
 $(VBOX_JXPCOM_NSERROR): $(VBOX_PATH_XPCOM_SRC)/xpcom/base/nsError.h $(VBOX_JXPCOM_SRC)/tools/gen-nsError.pl | $(VBOX_JXPCOM_GEN)/java/
-        perl $(VBOX_JXPCOM_SRC)/tools/gen-nsError.pl < $< > $@
+        $(call MSG_L1,Generating $@)
+        $(QUIET)perl $(VBOX_JXPCOM_SRC)/tools/gen-nsError.pl < $< > $@
 
 ifndef VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
@@ -137 +139 @@
                $(VBOX_JXPCOM_SRC)/tools/genjifaces.xsl \
                | $(VBOX_JXPCOM_GEN)/java/interfaces/
-        $(QUIET)echo Generating Java interface files
+        $(call MSG_L1,Generating Java interface files)
         $(QUIET)$(RM) -f $(wildcard $(VBOX_JXPCOM_GEN)/java/interfaces/*.java)
         $(QUIET)$(VBOX_XSLTPROC)   \

trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h

@@ -79 +79 @@
 // unfortunatelly, if SOLARIS is defined Python porting layer 
 // defines gethostname() in invalid fashion what kills compilation
-#ifdef SOLARIS
-#undef SOLARIS
-#define SOLARIS_WAS_DEFINED
-#endif
+# ifdef SOLARIS
+#  undef SOLARIS
+#  define SOLARIS_WAS_DEFINED
+# endif
+
+// Python.h/pyconfig.h redefines _XOPEN_SOURCE on some hosts
+# ifdef _XOPEN_SOURCE
+#  define VBOX_XOPEN_SOURCE_DEFINED _XOPEN_SOURCE
+#  undef _XOPEN_SOURCE
+# endif
+
+#endif /* VBOX_PYXPCOM */
 
 #include <Python.h>
 
-#ifdef SOLARIS_WAS_DEFINED
-#define SOLARIS
-#undef SOLARIS_WAS_DEFINED
-#endif
-
 #ifdef VBOX_PYXPCOM
-#if (PY_VERSION_HEX <= 0x02040000)
-// although in more recent versions of Python this type is ssize_t, earlier 
+
+# ifdef SOLARIS_WAS_DEFINED
+#  define SOLARIS
+#  undef SOLARIS_WAS_DEFINED
+# endif
+
+// restore the old value of _XOPEN_SOURCE if not defined by Python.h/pyconfig.h
+# if !defined(_XOPEN_SOURCE) && defined(VBOX_XOPEN_SOURCE_DEFINED)
+#  define _XOPEN_SOURCE VBOX_XOPEN_SOURCE_DEFINED
+# endif
+# undef VBOX_XOPEN_SOURCE_DEFINED
+
+# if (PY_VERSION_HEX <= 0x02040000)
+// although in more recent versions of Python this type is ssize_t, earlier
 // it was used as int
 typedef int Py_ssize_t;
-#endif
-
-#else
-
-#include <Python.h>
-
-#endif
-
-#if (PY_VERSION_HEX <= 0x02030000)
+# endif
+
+# if (PY_VERSION_HEX <= 0x02030000)
 // this one not defined before
 inline PyObject *PyBool_FromLong(long ok)
@@ -116 +125 @@
    return result;
 }
-#endif
-
-#endif
+# endif
+
+#endif /* VBOX_PYXPCOM */
 
 #ifdef BUILD_PYXPCOM

trunk/src/libs/xpcom18a4/python/src/VariantUtils.cpp

@@ -366 +366 @@
                 memcpy(pthis, PyString_AS_STRING(sequence_ob), sequence_size);
                 if (release_seq)
+                {
                         Py_DECREF(sequence_ob);
+                }
                 return PR_TRUE;
         }