summaryrefslogtreecommitdiff
path: root/include/postwin.h
diff options
context:
space:
mode:
authorAshod Nakashian <ashodnakashian@yahoo.com>2015-11-10 20:47:58 -0500
committerCaolán McNamara <caolanm@redhat.com>2015-11-12 10:55:41 +0000
commit1a494d9a00208eef790400bdbd8b3e5c7fed4886 (patch)
tree9e305bbf11be0aacfa3af942a7c250f423b629a9 /include/postwin.h
parentd7801c39826f2f24f7340e1b25809d3bb65d6099 (diff)
Windows header sanitization
Isolation of windows headers using prewin.h and postwin.h headers and making headers dependent on them more self contained. Conversion of TCHAR to WCHAR and LPCTSTR to LPCWSTR etc. and cleanup of unnecessary casts. Change-Id: I7eff5c477d9223a064bfb4d962ff6d61960ee69c Reviewed-on: https://gerrit.libreoffice.org/19901 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/postwin.h')
-rw-r--r--include/postwin.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/include/postwin.h b/include/postwin.h
index 769d2e68cbe1..e1e151dfcaaa 100644
--- a/include/postwin.h
+++ b/include/postwin.h
@@ -22,6 +22,13 @@
#undef Rectangle
#undef DELETE
#undef OPTIONAL
+#undef PASSTHROUGH
+#undef STRICT
+#undef ABSOLUTE
+#undef RELATIVE
+#undef IGNORE
+#undef IN
+#undef OUT
#undef Folder
#undef GradientStyle_RECT
@@ -64,6 +71,10 @@
#undef Yield
+#undef GetTimeFormat
+
+#undef CompareString
+
/* new StretchBlt() Modes (simpler names) */
#ifndef STRETCH_ANDSCANS
#define STRETCH_ANDSCANS 1
@@ -75,9 +86,11 @@
#define STRETCH_DELETESCANS 3
#endif
+#ifdef __cplusplus
extern "C"
{
BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
}
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */