Ticket #1: extpacks.diff

\src\VBox\ExtPacks/VBoxDTrace/include/VBoxDTraceLibCWrappers.h

@@ -27 +27 @@
 #ifdef RT_OS_WINDOWS
 # include <process.h>
 #else
+# ifdef RT_OS_OS2
+#  include <sys/time.h>
+# endif
 # include <sys/types.h>
 # include <limits.h>        /* Workaround for syslimit.h bug in gcc 4.8.3 on gentoo. */
 # ifndef RT_OS_SOLARIS

\src\VBox\ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h

@@ -51 +51 @@
 #ifndef RT_OS_SOLARIS
 typedef int64_t                     longlong_t;
 typedef uint64_t                    u_longlong_t;
+#if !defined(RT_OS_OS2) || defined(IN_RING0)
 typedef uint64_t                    hrtime_t;
 typedef uint32_t                    id_t;
+#endif
 typedef uint32_t                    zoneid_t;
 #endif
 #if !defined(NGREG) || !defined(RT_OS_LINUX)

\src\VBox\ExtPacks/VBoxDTrace/Makefile.kmk

@@ -92 +92 @@
  DLLS += VBoxDTraceMain
  VBoxDTraceMain_TEMPLATE = VBoxR3ExtPackDTrace
  VBoxDTraceMain_SOURCES = VBoxDTraceMain.cpp
+ ifeq ($(KBUILD_TARGET),os2)
+  VBoxDTraceMain_NAME       = VBoxDTM
+ endif
  $(call VBOX_SET_VER_INFO_DLL,VBoxDTraceMain,VBoxDTrace Main module)
 
 
@@ -108 +111 @@
  ifn1of ($(KBUILD_TARGET), win)
   VBoxDTraceCmd_CFLAGS = -Wno-format $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow
  endif
+ if1of ($(KBUILD_TARGET),os2)
+  VBoxDTraceCmd_NAME       = VBoxDTC
+ endif
  VBoxDTraceCmd_INCS = \
         include \
         $(VBOXDT_PATH_UTS)/common \
@@ -239 +245 @@
  ifeq ($(VBOX_LDR_FMT),elf)
   VBoxDTraceR0_LDFLAGS = -e ModuleInit
  endif
+ if1of ($(KBUILD_TARGET),os2)
+  VBoxDTraceR0_NAME       = VBoxDTR0
+ endif
  VBoxDTraceR0_INCS = \
         include \
         $(VBOXDT_PATH_UTS)/common
@@ -299 +308 @@
   VBOX_VBOXDTRACE_FILES += $(call VBOX_VBOXDTRACE_FILES_MACRO,linux.x86,bin,so)
  endif
  if1of (os2.x86, $(VBOX_WITH_EXTPACK_OS_ARCHS))
-  VBOX_VBOXDTRACE_FILES += $(call VBOX_VBOXDTRACE_FILES_MACRO,os2.x86,bin,so)
+  VBOX_VBOXDTRACE_FILES += $(call VBOX_VBOXDTRACE_FILES_MACRO,os2.x86,bin,dll)
  endif
  if1of (solaris.amd64, $(VBOX_WITH_EXTPACK_OS_ARCHS))
   VBOX_VBOXDTRACE_FILES += $(call VBOX_VBOXDTRACE_FILES_MACRO,solaris.amd64,bin,so)

\src\VBox\ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_cc.c

@@ -103 +103 @@
 # else
 #  include <unistd.h>
 # endif
-# if defined(RT_OS_WINDOWS) || defined(RT_OS_DARWIN)
+# if defined(RT_OS_WINDOWS) || defined(RT_OS_DARWIN) || defined(RT_OS_OS2)
 #  ifdef _MSC_VER
 #   define ftruncate64  _chsize
 #  else

\src\VBox\ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_open.c

@@ -47 +47 @@
 
 #else  /* VBOX */
 # ifndef _MSC_VER
+# ifdef RT_OS_OS2
+# include <sys/types.h>
+# endif
 # include <sys/resource.h>
 # include <unistd.h>
 # else

\src\VBox\ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_options.c

@@ -42 +42 @@
 
 #else  /* VBOX */
 # ifndef _MSC_VER
+#  ifdef RT_OS_OS2
+#  include <sys/types.h>
+#  endif
 #  include <sys/resource.h>
 #  include <unistd.h>
 #  include <signal.h>
-#  if defined(RT_OS_DARWIN)
+#  if defined(RT_OS_DARWIN) || defined(RT_OS_OS2)
 #   define open64 open
 #  endif
 # else

\src\VBox\ExtPacks/VNC/Makefile.kmk

@@ -51 +51 @@
 VBoxVNCMain_TEMPLATE = VBoxR3ExtPackVNC
 VBoxVNCMain_SOURCES = VBoxVNCMain.cpp
 VBoxVNCMain_DEFS =
+VBoxVNCMain_NAME.os2 = VBoxVNCM
 
 #
 # VBoxVNC - The VNC VRDE module.
@@ -60 +61 @@
 VBoxVNC_SOURCES = VBoxVNC.cpp
 # NOTE: vncserver is covered by GPL, so the extpack must be GPL, too.
 VBoxVNC_LIBS = vncserver
+VBoxVNC_LIBS.os2 = vncserver socket pthread z png jpeg ssl crypto socket gcc492.dll
 VBoxVNC_DEFS =
+VBoxVNC_INCS.os2 =  /@unixroot/usr/include \
+                    /@unixroot/usr/local/include
+VBoxVNC_LIBPATH.os2 =   /@unixroot/usr/lib \
+                        /@unixroot/usr/local/lib
+VBoxVNC_NAME.os2 = VBoxVNC
 
 #
 # Install the description.