From 7cd2c9fc43d31d965997e3efa27a8a3f79893085 Mon Sep 17 00:00:00 2001 From: skyjake Date: Sat, 28 Jan 2012 14:04:00 +0200 Subject: [PATCH] GCC: Fixed build The definition of rtexmapunit_texture_s was not accepted by gcc. Removed the union/struct and placed all the members in a regular struct. Also fixed Doxygen group markers, which need to look like: ///@{ ///@} and not: ///{ ///} --- doomsday/engine/portable/include/r_data.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/doomsday/engine/portable/include/r_data.h b/doomsday/engine/portable/include/r_data.h index dbf0dbf0b6..0a6210232c 100644 --- a/doomsday/engine/portable/include/r_data.h +++ b/doomsday/engine/portable/include/r_data.h @@ -57,18 +57,14 @@ struct font_s; /** * @defgroup textureUnitFlags Texture Unit Flags */ -///{ +///@{ #define TUF_TEXTURE_IS_MANAGED 0x1 ///< A managed texture is bound to this unit. -///} +///@} typedef struct rtexmapunit_texture_s { - union { - struct unmanaged { - DGLuint glName; ///< Texture used on this layer (if any). - int magMode; ///< GL texture magnification filter. - }; - struct texturevariant_s* variant; - }; + DGLuint glName; ///< Texture used on this layer (if any). + int magMode; ///< GL texture magnification filter. + struct texturevariant_s* variant; /// @ref textureUnitFlags int flags; } rtexmapunit_texture_t;