#i118923# OS/2, use pmbidi header from dev toolkit.

solenv/inc/svpm.h

@@ -61,6 +61,9 @@ extern "C" {
 
 #include <os2.h>
 #include <unikbd.h>
+#ifdef VCL_OS2
+#include <pmbidi.h>
+#endif
 
 #undef BOOL
 #undef BYTE

vcl/Library_vcl.mk

@@ -45,6 +45,12 @@ $(eval $(call gb_Library_set_include,vcl,\
     -I$(OUTDIR)/inc \
     $$(FREETYPE_CFLAGS) \
 ))
+ifeq ($(GUIBASE),os2)
+$(eval $(call gb_Library_set_include,vcl,\
+    $$(INCLUDE) \
+    -idirafter /@unixroot/usr/dev/toolkit452/h \
+))
+endif
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_set_cxxflags,vcl,\
     $$(CXXFLAGS) \

vcl/inc/os2/salframe.h

@@ -27,10 +27,6 @@
 #include <vcl/sysdata.hxx>
 #include <salframe.hxx>
 
-#ifndef PM_BIDI_INCLUDED
-#include <pmbidi.h>
-#endif
-
 #ifndef __UCONV_H__
 #include <uconv.h>
 #endif

vcl/os2/source/window/salframe.cxx

@@ -24,6 +24,7 @@
 #define INCL_DOS
 #define INCL_PM
 #define INCL_WIN
+#define VCL_OS2
 #include <svpm.h>
 
 #include <string.h>