From 1aebc22fd2a0f60a5ad4cd4e9ff6bb8a636524af Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 11 Dec 2013 18:47:17 +0100
Subject: prewin.h: remove silly extern "C" nonsense which prevents...

... using prewin.h/postwin.h around ATL headers.  Also remove some other
cruft while at it.

Change-Id: I7d081dae88273dfd214ef078f5844ce266e388fb
(cherry picked from commit f5a54cbf120efb335205e00ba18a9038449b92c9)
---
 include/postwin.h | 11 -----------
 include/prewin.h  |  4 ----
 2 files changed, 15 deletions(-)

(limited to 'include')

diff --git a/include/postwin.h b/include/postwin.h
index 71b85ea855d7..86f27ad95755 100644
--- a/include/postwin.h
+++ b/include/postwin.h
@@ -19,12 +19,6 @@
 
 /* nicht geschuetz, muss als gegenstueck zu prewin.h includet werden */
 
-#ifdef WNT
-#ifdef __cplusplus
-}
-#endif
-#endif
-
 #undef Region
 #undef PolyPolygon
 #undef Polygon
@@ -228,16 +222,11 @@
 #define STRETCH_DELETESCANS     3
 #endif
 
-#ifdef WNT
 extern "C"
 {
 BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
 BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt );
 BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt );
 }
-#endif
-
-// svwin.h nicht mehr includen
-#define _SVWIN_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/prewin.h b/include/prewin.h
index e98b901e6e59..a30afb83c49e 100644
--- a/include/prewin.h
+++ b/include/prewin.h
@@ -28,10 +28,6 @@
 #define Folder       WIN_Folder
 #define GradientStyle_RECT  WIN_GradientStyle_RECT
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #if !defined STRICT
 #define STRICT
 #endif
-- 
cgit