Alexandre Julliard : gdi32: Move GET_DC_PHYSDEV back to gdi_private.h, it can't be used from external drivers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1f8a0eb40e75f24b16b6c93173af777548259400
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f8a0eb40e75f24b16b6c93173...

Author: Alexandre Julliard 
Date:   Wed Jul  6 17:35:17 2011 +0200

gdi32: Move GET_DC_PHYSDEV back to gdi_private.h, it can't be used from external drivers.

---

dlls/gdi32/gdi_private.h  |    3 +++
 include/wine/gdi_driver.h |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 7fa14d3..21a92c8 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -273,6 +273,9 @@ static inline INT GDI_ROUND(double val)
    return (int)floor(val + 0.5);
 }

+#define GET_DC_PHYSDEV(dc,func) \
+    get_physdev_entry_point( (dc)->physDev, FIELD_OFFSET(struct gdi_dc_funcs,func))
+
 /* bitmap object */

typedef struct tagBITMAPOBJ
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 2c05d82..3a9685c 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -200,7 +200,7 @@ static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset )
     return dev;
 }

-#define GET_DC_PHYSDEV(dc,func) get_physdev_entry_point( (dc)->physDev, FIELD_OFFSET(DC_FUNCTIONS,func))
-#define GET_NEXT_PHYSDEV(dev,func) get_physdev_entry_point( (dev)->next, FIELD_OFFSET(DC_FUNCTIONS,func))
+#define GET_NEXT_PHYSDEV(dev,func) \
+    get_physdev_entry_point( (dev)->next, FIELD_OFFSET(struct gdi_dc_funcs,func))

#endif /* __WINE_WINE_GDI_DRIVER_H */