Changeset 86650 in vbox for trunk/src/libs

Timestamp:

Oct 20, 2020 2:26:02 PM (4 years ago)

Author:

vboxsync

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

141026

Message:

Fixed bad commit. Hope this help.

Location:

trunk/src/libs

Files:

• curl-7.64.0/lib/sendf.c (modified) (1 diff)
• xpcom18a4/python/Makefile.kmk (modified) (2 diffs)

trunk/src/libs/curl-7.64.0/lib/sendf.c

@@ -828 +828 @@
     case CURLINFO_HEADER_OUT:
     case CURLINFO_HEADER_IN:
-    case CURLINFO_DATA_IN:      /* XXX: uwe */
-    case CURLINFO_DATA_OUT:     /* XXX: uwe */
       fwrite(s_infotype[type], 2, 1, data->set.err);
       fwrite(ptr, size, 1, data->set.err);

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

@@ -206 +206 @@
 # Unversioned Python 2.x.
 #
-# Note! No python LIBS here as we don't want to depend on any specific python
-#       version in a generic extension module.
-#
- if (defined(VBOX_PYTHON27_INC) || defined(VBOX_PYTHON26_INC)) && "$(KBUILD_TARGET)" != "darwin"
-
+ if defined(VBOX_PYTHON27_INC) || defined(VBOX_PYTHON26_INC)
 DLLS += VBoxPython2
 VBoxPython2_EXTENDS    = VBoxPythonBase
@@ -222 +218 @@
   if defined(VBOX_PYTHON26_INC)
 VBoxPython2_INCS       = $(VBOX_PYTHON26_INC)
+   ifn1of ($(KBUILD_TARGET), linux)
+VBoxPython2_LIBS       = $(VBOX_PYTHON26_LIB)
+   endif
   else
 VBoxPython2_INCS       = $(VBOX_PYTHON27_INC)
-  endif
-
-  if defined(VBOX_WITH_32_ON_64_MAIN_API) && (defined(VBOX_PYTHON26LIB_X86) || defined(VBOX_PYTHON27LIB_X86))
+   ifn1of ($(KBUILD_TARGET), linux)
+VBoxPython2_LIBS       = $(VBOX_PYTHON27_LIB)
+   endif
+  endif
+ endif
+
+ if defined(VBOX_WITH_32_ON_64_MAIN_API) && (defined(VBOX_PYTHON27_LIB_X86) || defined(VBOX_PYTHON26_INC_X86))
 DLLS += VBoxPython2_x86
 VBoxPython2_x86_EXTENDS    = VBoxPythonBase_x86
 VBoxPython2_x86_EXTENDS_BY = appending
-VBoxPython2_x86_DEFS       = VBOX_PYXPCOM_MAJOR_VERSIONED
-   ifdef KMK_WITH_VERSION_COMPARE
+VBoxPython2_x86_DEFS       = VBOX_PYXPCOM_MAJOR_VERSIONED $(VBoxPythonBase_x86_DEFS)
+  ifdef KMK_WITH_VERSION_COMPARE
 VBoxPython2_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,-x86)
-   else
+  else
 VBoxPython2_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7" && "$(length-var VBOX_DEF_MACOSX_VERSION_MIN)" == "4",OSX107,-x86)
+  endif
+  if defined(VBOX_PYTHON26LIB_X86)
+VBoxPython2_x86_INCS       = $(VBOX_PYTHON26_INC)
+   ifn1of ($(KBUILD_TARGET), linux)
+VBoxPython2_x86_LIBS       = $(VBOX_PYTHON26_LIB_X86)
    endif
-   if defined(VBOX_PYTHON26LIB_X86)
-VBoxPython2_x86_INCS       = $(VBOX_PYTHON26_INC)
-   else
+  else
 VBoxPython2_x86_INCS       = $(VBOX_PYTHON27_INC)
+   ifn1of ($(KBUILD_TARGET), linux)
+VBoxPython2_x86_LIBS       = $(VBOX_PYTHON27_LIB_X86)
    endif
   endif
-
- endif # (defined(VBOX_PYTHON27_INC) || defined(VBOX_PYTHON26_INC)) && "$(KBUILD_TARGET)" != "darwin"
+ endif