HEADERS: move EMR*16 definitions to wingdi.h, as they're part of the WIN32 API

[Mike McCormack]

ChangeLog:
* move EMR*16 definitions to wingdi.h, as they're part of the WIN32 API
-------------- next part --------------
Index: include/wingdi.h
===================================================================
RCS file: /home/wine/wine/include/wingdi.h,v
retrieving revision 1.102
diff -u -r1.102 wingdi.h
--- include/wingdi.h	12 Mar 2004 19:46:12 -0000	1.102
+++ include/wingdi.h	29 Mar 2004 15:26:42 -0000
@@ -2335,6 +2335,35 @@
 typedef struct {
     EMR    emr;
     RECTL  rclBounds;
+    DWORD  cpts;
+    POINTS apts[1];
+} EMRPOLYLINE16,     *PEMRPOLYLINE16,
+  EMRPOLYBEZIER16,   *PEMRPOLYBEZIER16,
+  EMRPOLYGON16,      *PEMRPOLYGON16,
+  EMRPOLYBEZIERTO16, *PEMRPOLYBEZIERTO16,
+  EMRPOLYLINETO16,   *PEMRPOLYLINETO16;
+
+typedef struct {
+    EMR    emr;
+    RECTL  rclBounds;
+    DWORD  cpts;
+    POINTS apts[1];
+    BYTE   abTypes[1];
+} EMRPOLYDRAW16, *PEMRPOLYDRAW16;
+
+typedef struct {
+    EMR     emr;
+    RECTL   rclBounds;
+    DWORD   nPolys;
+    DWORD   cpts;
+    DWORD   aPolyCounts[1];
+    POINTS  apts[1];
+} EMRPOLYPOLYLINE16, *PEMRPOLYPOLYLINE16,
+  EMRPOLYPOLYGON16,  *PEMRPOLYPOLYGON16;
+
+typedef struct {
+    EMR    emr;
+    RECTL  rclBounds;
     DWORD  cptl;
     POINTL aptl[1];
     BYTE   abTypes[1];
Index: include/wine/wingdi16.h
===================================================================
RCS file: /home/wine/wine/include/wine/wingdi16.h,v
retrieving revision 1.31
diff -u -r1.31 wingdi16.h
--- include/wine/wingdi16.h	12 Mar 2004 19:46:12 -0000	1.31
+++ include/wine/wingdi16.h	29 Mar 2004 15:26:43 -0000
@@ -311,35 +311,6 @@
     HMETAFILE16  hMF;
 } METAFILEPICT16, *LPMETAFILEPICT16;
 
-typedef struct {
-    EMR    emr;
-    RECTL  rclBounds;
-    DWORD  cpts;
-    POINT16 apts[1];
-} EMRPOLYLINE16,     *PEMRPOLYLINE16,
-  EMRPOLYBEZIER16,   *PEMRPOLYBEZIER16,
-  EMRPOLYGON16,      *PEMRPOLYGON16,
-  EMRPOLYBEZIERTO16, *PEMRPOLYBEZIERTO16,
-  EMRPOLYLINETO16,   *PEMRPOLYLINETO16;
-
-typedef struct {
-    EMR    emr;
-    RECTL  rclBounds;
-    DWORD  cpts;
-    POINT16 apts[1];
-    BYTE   abTypes[1];
-} EMRPOLYDRAW16, *PEMRPOLYDRAW16;
-
-typedef struct {
-    EMR     emr;
-    RECTL   rclBounds;
-    DWORD   nPolys;
-    DWORD   cpts;
-    DWORD   aPolyCounts[1];
-    POINT16 apts[1];
-} EMRPOLYPOLYLINE16, *PEMRPOLYPOLYLINE16,
-  EMRPOLYPOLYGON16,  *PEMRPOLYPOLYGON16;
-
 typedef INT16 (CALLBACK *MFENUMPROC16)(HDC16,HANDLETABLE16*,METARECORD*,
                                        INT16,LPARAM);
 typedef struct