[ros-diffs] [fireball] 41675: - Prevent PEVENT type redifinition (which is fine with MSVC but not with GCC).

fireball at svn.reactos.org fireball at svn.reactos.org
Sun Jun 28 22:52:38 CEST 2009


Author: fireball
Date: Mon Jun 29 00:52:37 2009
New Revision: 41675

URL: http://svn.reactos.org/svn/reactos?rev=41675&view=rev
Log:
- Prevent PEVENT type redifinition (which is fine with MSVC but not with GCC).

Modified:
    trunk/reactos/include/ddk/ntddvdeo.h
    trunk/reactos/include/ddk/winddi.h

Modified: trunk/reactos/include/ddk/ntddvdeo.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddvdeo.h?rev=41675&r1=41674&r2=41675&view=diff
==============================================================================
--- trunk/reactos/include/ddk/ntddvdeo.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntddvdeo.h [iso-8859-1] Mon Jun 29 00:52:37 2009
@@ -426,7 +426,9 @@
 #define VIDEO_DUALVIEW_PRIMARY            0x80000000
 #define VIDEO_DUALVIEW_SECONDARY          0x40000000
 
+#ifndef _WINDDI_
 typedef struct _ENG_EVENT *PEVENT;
+#endif
 
 typedef struct _ENG_EVENT
 {

Modified: trunk/reactos/include/ddk/winddi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=41675&r1=41674&r2=41675&view=diff
==============================================================================
--- trunk/reactos/include/ddk/winddi.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/winddi.h [iso-8859-1] Mon Jun 29 00:52:37 2009
@@ -84,7 +84,9 @@
 DECLARE_HANDLE(DHPDEV);
 DECLARE_HANDLE(HDRVOBJ);
 
+#ifndef __NTDDVDEO_H
 typedef struct _ENG_EVENT *PEVENT;
+#endif
 
 #define OPENGL_CMD                        4352
 #define OPENGL_GETINFO                    4353



More information about the Ros-diffs mailing list