Index: trunk/src/VBox/Additions/os2/Config.kmk
===================================================================
--- trunk/src/VBox/Additions/os2/Config.kmk	(revision 98232)
+++ trunk/src/VBox/Additions/os2/Config.kmk	(revision 98416)
@@ -52,5 +52,5 @@
 TEMPLATE_VBoxOs2Vac308_ARTOOL  = GCC3OMF
 TEMPLATE_VBoxOs2Vac308_INST    = $(INST_ADDITIONS)
-TEMPLATE_VBoxOs2Vac308_DEFS    =  RT_OS_OS2 IN_RING3 ## @todo IN_GUEST IN_GUEST_R3 IN_RT_R3
+TEMPLATE_VBoxOs2Vac308_DEFS    = RT_OS_OS2 IN_RING3  ## @todo IN_GUEST IN_GUEST_R3 IN_RT_R3
 
 TEMPLATE_VBoxOs2Vac308_CFLAGS  += /Gn+               # Do not generate default libraries in object.
Index: trunk/src/VBox/Additions/os2/Makefile.kmk
===================================================================
--- trunk/src/VBox/Additions/os2/Makefile.kmk	(revision 98232)
+++ trunk/src/VBox/Additions/os2/Makefile.kmk	(revision 98416)
@@ -39,5 +39,5 @@
 ifndef VBOX_OSE
  include $(PATH_SUB_CURRENT)/VBoxGradd/Makefile.kmk
-# include $(PATH_SUB_CURRENT)/VBoxGrext/Makefile.kmk
+ # include $(PATH_SUB_CURRENT)/VBoxGrext/Makefile.kmk
  include $(PATH_SUB_CURRENT)/VBoxMouse/Makefile.kmk
  include $(PATH_SUB_CURRENT)/Bin/Makefile.kmk
@@ -74,6 +74,6 @@
 VBoxOs2AdditionsInstall_SOURCES          = \
 	VBoxOs2AdditionsInstall.cpp \
- 	$(VBOX_PATH_RUNTIME_SRC)/common/path/RTPathStripFilename.cpp \
- 	$(VBOX_PATH_RUNTIME_SRC)/common/path/RTPathEnsureTrailingSeparator.cpp
+	$(VBOX_PATH_RUNTIME_SRC)/common/path/RTPathStripFilename.cpp \
+	$(VBOX_PATH_RUNTIME_SRC)/common/path/RTPathEnsureTrailingSeparator.cpp
 if 1
  VBOX_PATH_RUNTIME_SRC ?= $(PATH_ROOT)/src/VBox/Runtime
@@ -90,5 +90,5 @@
  VBoxOs2AdditionsInstall_INCS           <= \
  	$(PATH_ROOT)/include/iprt/nocrt \
-	$(VBOX_PATH_RUNTIME_SRC)/include
+ 	$(VBOX_PATH_RUNTIME_SRC)/include
  VBoxOs2AdditionsInstall_SOURCES        += \
  	VBoxOs2AdditionsInstallA.asm \
Index: trunk/src/VBox/Additions/os2/VBoxSF/Makefile.kmk
===================================================================
--- trunk/src/VBox/Additions/os2/VBoxSF/Makefile.kmk	(revision 98232)
+++ trunk/src/VBox/Additions/os2/VBoxSF/Makefile.kmk	(revision 98416)
@@ -32,7 +32,7 @@
  VBOX_USE_WATCOM_FOR_OS2  = 1
  KBUILD_TARGET      = os2
-  BUILD_TARGET      = os2
+ BUILD_TARGET       = os2
  KBUILD_TARGET_ARCH = x86
-  BUILD_TARGET_ARCH = x86
+ BUILD_TARGET_ARCH  = x86
 endif
 
@@ -65,5 +65,5 @@
 TOOL_VBoxNasmDot_COMPILE_AS_DEPORD =
 define TOOL_VBoxNasmDot_COMPILE_AS_CMDS
-ifdef TOOL_VBoxNasmDot_USE_KSUBMIT
+ ifdef TOOL_VBoxNasmDot_USE_KSUBMIT
 	$(QUIET)kmk_builtin_kSubmit -C $(PATH_OUT_BASE) -- $(TOOL_VBoxNasmDot_AS)\
 		$(flags) $(qaddprefix sh,-i, $(qaddsuffix ,/,$(incs))) $(qaddprefix sh,-D, $(defs))\
@@ -72,5 +72,5 @@
                -MD "$(dep)" -MP\
 		$(abspath $(source))
-else
+ else
 	$(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE) -- $(TOOL_VBoxNasmDot_AS)\
 		$(flags) $(qaddprefix sh,-i, $(qaddsuffix ,/,$(incs))) $(qaddprefix sh,-D, $(defs))\
@@ -79,5 +79,5 @@
                -MD "$(dep)" -MP\
 		$(abspath $(source))
-endif
+ endif
 	$(QUIET)"$(dotseg_1_TARGET)" "$(obj)"
 endef
@@ -97,5 +97,5 @@
 TEMPLATE_VBoxR0DrvIFS_EXTENDS = VBoxGuestR0Drv
 ifdef VBOX_USE_WATCOM_FOR_OS2
-TEMPLATE_VBoxR0DrvIFS_LDFLAGS = $(subst physdevice,dll, $(TEMPLATE_VBoxGuestR0Drv_LDFLAGS))
+ TEMPLATE_VBoxR0DrvIFS_LDFLAGS = $(subst physdevice,dll, $(TEMPLATE_VBoxGuestR0Drv_LDFLAGS))
 endif
 TEMPLATE_VBoxR0DrvIFS_SYSSUFF = .ifs
@@ -114,74 +114,74 @@
 	$(PATH_ROOT)/src/VBox/Runtime/include
 ifdef VBOX_USE_WATCOM_FOR_OS2
-VBoxSF_LDFLAGS      := \
-	OPTION MODNAME='VBoxSF' \
-	SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
-	    TYPE DATA PRELOAD DYNAMIC
-#	OPTION DESCRIPTION "'VirtualBox Guest Additions Shared Folder FSD for OS/2.'" - quoting issues
-# Data exports:
-VBoxSF_LDFLAGS += \
-	EXPORT 'FS_ATTRIBUTE' \
-	EXPORT 'FS_NAME' \
-	EXPORT 'FS_MPSAFEFLAGS2' \
-	EXPORT 'FS32_ATTRIBUTE'
-# 16-bit entry points.
-VBoxSF_LDFLAGS += \
-	EXPORT 'FS_ALLOCATEPAGESPACE' \
-	EXPORT 'FS_ATTACH' \
-	EXPORT 'FS_CANCELLOCKREQUEST' \
-	EXPORT 'FS_CANCELLOCKREQUESTL' \
-	EXPORT 'FS_CHDIR' \
-	EXPORT 'FS_CHGFILEPTR' \
-	EXPORT 'FS_CLOSE' \
-	EXPORT 'FS_COMMIT' \
-	EXPORT 'FS_COPY' \
-	EXPORT 'FS_DELETE' \
-	EXPORT 'FS_DOPAGEIO' \
-	EXPORT 'FS_EXIT' \
-	EXPORT 'FS_FILEATTRIBUTE' \
-	EXPORT 'FS_FILEINFO' \
-	EXPORT 'FS_FILEIO' \
-	EXPORT 'FS_FILELOCKS' \
-	EXPORT 'FS_FILELOCKSL' \
-	EXPORT 'FS_FINDCLOSE' \
-	EXPORT 'FS_FINDFIRST' \
-	EXPORT 'FS_FINDFROMNAME' \
-	EXPORT 'FS_FINDNEXT' \
-	EXPORT 'FS_FINDNOTIFYCLOSE' \
-	EXPORT 'FS_FINDNOTIFYFIRST' \
-	EXPORT 'FS_FINDNOTIFYNEXT' \
-	EXPORT 'FS_FLUSHBUF' \
-	EXPORT 'FS_FSCTL' \
-	EXPORT 'FS_FSINFO' \
-	EXPORT 'FS_INIT' \
-	EXPORT 'FS_IOCTL' \
-	EXPORT 'FS_MKDIR' \
-	EXPORT 'FS_MOUNT' \
-	EXPORT 'FS_MOVE' \
-	EXPORT 'FS_NEWSIZE' \
-	EXPORT 'FS_NEWSIZEL' \
-	EXPORT 'FS_NMPIPE' \
-	EXPORT 'FS_OPENCREATE' \
-	EXPORT 'FS_OPENPAGEFILE' \
-	EXPORT 'FS_PATHINFO' \
-	EXPORT 'FS_PROCESSNAME' \
-	EXPORT 'FS_READ' \
-	EXPORT 'FS_RMDIR' \
-	EXPORT 'FS_SETSWAP' \
-	EXPORT 'FS_SHUTDOWN' \
-	EXPORT 'FS_VERIFYUNCNAME' \
-	EXPORT 'FS_WRITE'
-# 32-bit entry points.
-VBoxSF_LDFLAGS += \
-	EXPORT 'FS32_CHGFILEPTRL' \
-	EXPORT 'FS32_READ' \
-	EXPORT 'FS32_READFILEATCACHE' \
-	EXPORT 'FS32_RETURNFILECACHE' \
-	EXPORT 'FS32_WRITE'
-else
-VBoxSF_LDFLAGS      := $(addprefix -Zlinker , \
-	SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
-	    TYPE DATA PRELOAD DYNAMIC)
-#VBoxSF_LDFLAGS      += -s -t -v
+ VBoxSF_LDFLAGS     := \
+ 	OPTION MODNAME='VBoxSF' \
+ 	SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
+ 	TYPE DATA PRELOAD DYNAMIC
+ #	OPTION DESCRIPTION "'VirtualBox Guest Additions Shared Folder FSD for OS/2.'" - quoting issues
+ # Data exports:
+ VBoxSF_LDFLAGS += \
+ 	EXPORT 'FS_ATTRIBUTE' \
+ 	EXPORT 'FS_NAME' \
+ 	EXPORT 'FS_MPSAFEFLAGS2' \
+ 	EXPORT 'FS32_ATTRIBUTE'
+ # 16-bit entry points.
+ VBoxSF_LDFLAGS += \
+ 	EXPORT 'FS_ALLOCATEPAGESPACE' \
+ 	EXPORT 'FS_ATTACH' \
+ 	EXPORT 'FS_CANCELLOCKREQUEST' \
+ 	EXPORT 'FS_CANCELLOCKREQUESTL' \
+ 	EXPORT 'FS_CHDIR' \
+ 	EXPORT 'FS_CHGFILEPTR' \
+ 	EXPORT 'FS_CLOSE' \
+ 	EXPORT 'FS_COMMIT' \
+ 	EXPORT 'FS_COPY' \
+ 	EXPORT 'FS_DELETE' \
+ 	EXPORT 'FS_DOPAGEIO' \
+ 	EXPORT 'FS_EXIT' \
+ 	EXPORT 'FS_FILEATTRIBUTE' \
+ 	EXPORT 'FS_FILEINFO' \
+ 	EXPORT 'FS_FILEIO' \
+ 	EXPORT 'FS_FILELOCKS' \
+ 	EXPORT 'FS_FILELOCKSL' \
+ 	EXPORT 'FS_FINDCLOSE' \
+ 	EXPORT 'FS_FINDFIRST' \
+ 	EXPORT 'FS_FINDFROMNAME' \
+ 	EXPORT 'FS_FINDNEXT' \
+ 	EXPORT 'FS_FINDNOTIFYCLOSE' \
+ 	EXPORT 'FS_FINDNOTIFYFIRST' \
+ 	EXPORT 'FS_FINDNOTIFYNEXT' \
+ 	EXPORT 'FS_FLUSHBUF' \
+ 	EXPORT 'FS_FSCTL' \
+ 	EXPORT 'FS_FSINFO' \
+ 	EXPORT 'FS_INIT' \
+ 	EXPORT 'FS_IOCTL' \
+ 	EXPORT 'FS_MKDIR' \
+ 	EXPORT 'FS_MOUNT' \
+ 	EXPORT 'FS_MOVE' \
+ 	EXPORT 'FS_NEWSIZE' \
+ 	EXPORT 'FS_NEWSIZEL' \
+ 	EXPORT 'FS_NMPIPE' \
+ 	EXPORT 'FS_OPENCREATE' \
+ 	EXPORT 'FS_OPENPAGEFILE' \
+ 	EXPORT 'FS_PATHINFO' \
+ 	EXPORT 'FS_PROCESSNAME' \
+ 	EXPORT 'FS_READ' \
+ 	EXPORT 'FS_RMDIR' \
+ 	EXPORT 'FS_SETSWAP' \
+ 	EXPORT 'FS_SHUTDOWN' \
+ 	EXPORT 'FS_VERIFYUNCNAME' \
+ 	EXPORT 'FS_WRITE'
+ # 32-bit entry points.
+ VBoxSF_LDFLAGS += \
+ 	EXPORT 'FS32_CHGFILEPTRL' \
+ 	EXPORT 'FS32_READ' \
+ 	EXPORT 'FS32_READFILEATCACHE' \
+ 	EXPORT 'FS32_RETURNFILECACHE' \
+ 	EXPORT 'FS32_WRITE'
+else
+ VBoxSF_LDFLAGS     := $(addprefix -Zlinker , \
+ 	SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
+ 	TYPE DATA PRELOAD DYNAMIC)
+ #VBoxSF_LDFLAGS      += -s -t -v
 endif
 
@@ -215,13 +215,13 @@
 PROGRAMS += VBoxSFUtil
 ifdef VBOX_USE_WATCOM_FOR_OS2
-VBoxSFUtil_TEMPLATE = DUMMY
-VBoxSFUtil_TOOL     = OPENWATCOM
-VBoxSFUtil_ASTOOL   = NASM
-VBoxSFUtil_ASFLAGS  = -f obj -DASM_FORMAT_OMF
-VBoxSFUtil_INCS     = $(PATH_TOOL_OPENWATCOM)/h/os2
-VBoxSFUtil_LDFLAGS  = -bcl=os2v2 #"IMPORT DosGlobalInfo doscalls.217"
-VBoxSFUtil_DEFS     = $(DEFS) IN_RING3
-else
-VBoxSFUtil_TEMPLATE = VBoxGuestR3Exe
+ VBoxSFUtil_TEMPLATE = DUMMY
+ VBoxSFUtil_TOOL    = OPENWATCOM
+ VBoxSFUtil_ASTOOL  = NASM
+ VBoxSFUtil_ASFLAGS = -f obj -DASM_FORMAT_OMF
+ VBoxSFUtil_INCS    = $(PATH_TOOL_OPENWATCOM)/h/os2
+ VBoxSFUtil_LDFLAGS = -bcl=os2v2 #"IMPORT DosGlobalInfo doscalls.217"
+ VBoxSFUtil_DEFS    = $(DEFS) IN_RING3
+else
+ VBoxSFUtil_TEMPLATE = VBoxGuestR3Exe
 endif
 VBoxSFUtil_SOURCES  = \
