Changeset 33395 in vbox for trunk

Timestamp:

Oct 24, 2010 4:18:01 PM (14 years ago)

Author:

vboxsync

Message:

Additions/common: Some old OS/2 build fixes.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/Makefile.kmk (modified) (2 diffs)
• VBoxService/VBoxService.cpp (modified) (1 diff)
• VBoxService/VBoxServiceClipboard-os2.cpp (modified) (1 diff)
• VBoxService/VBoxServiceVMInfo.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -79 +79 @@
         win/VBoxGuest.rc
   endif
-  VBoxGuest2.cpp_DEFS    = VBOX_SVN_REV=$(VBOX_SVN_REV)
-  VBoxGuest.cpp_DEFS     = VBOX_SVN_REV=$(VBOX_SVN_REV)
   VBoxGuest_LIBS        += \
         $(VBOX_LIB_VBGL_R0BASE) \
@@ -114 +112 @@
   VBoxGuestLibOs2Hack_SOURCES = \
         VBoxGuest-os2.cpp \
-        VBoxGuest.cpp
+        VBoxGuest.cpp \
+        VBoxGuest2.cpp
  endif # OS/2
+ 
+ VBoxGuest2.cpp_DEFS    = VBOX_SVN_REV=$(VBOX_SVN_REV)
+ VBoxGuest.cpp_DEFS     = VBOX_SVN_REV=$(VBOX_SVN_REV)
 
  ifeq ($(KBUILD_TARGET),win)

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -28 +28 @@
 #ifndef RT_OS_WINDOWS
 # include <signal.h>
+# ifdef RT_OS_OS2
+#  define pthread_sigmask sigprocmask
+# endif
 #endif
 #ifdef RT_OS_FREEBSD

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp

@@ -367 +367 @@
             {
                 size_t cbPM = strlen(pszLocale) + 1;
-                APIRET rc = DosAllocSharedMem(&pvPM, NULL, cbPM, OBJ_GIVEABLE | OBJ_GETTABLE | OBJ_TILE | PAG_READ | PAG_WRITE | PAG_COMMIT);
-                if (rc == NO_ERROR)
+                APIRET orc = DosAllocSharedMem(&pvPM, NULL, cbPM, OBJ_GIVEABLE | OBJ_GETTABLE | OBJ_TILE | PAG_READ | PAG_WRITE | PAG_COMMIT);
+                if (orc == NO_ERROR)
                     memcpy(pvPM, pszLocale, cbPM);
                 else
                 {
-                    VBoxServiceError("DosAllocSharedMem(,,%#x,,) -> %ld\n", cb + sizeof(CLIPHEADER), rc);
+                    VBoxServiceError("DosAllocSharedMem(,,%#x,,) -> %ld\n", cb + sizeof(CLIPHEADER), orc);
                     pvPM = NULL;
                 }

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -36 +36 @@
 # include <net/if.h>
 # include <unistd.h>
-# ifndef RT_OS_FREEBSD
-#  include <utmpx.h> /* @todo FreeBSD 9 should have this. */
+# ifndef RT_OS_OS2
+#  ifndef RT_OS_FREEBSD
+#   include <utmpx.h> /* @todo FreeBSD 9 should have this. */
+#  endif
 # endif
 # ifdef RT_OS_SOLARIS
@@ -637 +639 @@
         }
 # else
+#  ifndef RT_OS_OS2 /** @todo port this to OS/2 */
         if (ioctl(sd, SIOCGIFHWADDR, &ifrequest[i]) < 0)
         {
@@ -643 +646 @@
             break;
         }
+#  endif
 # endif
 
+# ifndef RT_OS_OS2 /** @todo port this to OS/2 */
         char szMac[32];
-# if defined(RT_OS_SOLARIS)
+#  if defined(RT_OS_SOLARIS)
         uint8_t *pu8Mac = IfMac.au8;
-# else
+#  else
         uint8_t *pu8Mac = (uint8_t*)&ifrequest[i].ifr_hwaddr.sa_data[0];        /* @todo see above */
-# endif
+#  endif
         RTStrPrintf(szMac, sizeof(szMac), "%02X%02X%02X%02X%02X%02X",
                     pu8Mac[0], pu8Mac[1], pu8Mac[2], pu8Mac[3],  pu8Mac[4], pu8Mac[5]);
         RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%u/MAC", cIfacesReport);
         VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szMac);
+# endif /* !OS/2*/
 
         RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%u/Status", cIfacesReport);