Skip to content

Commit

Permalink
GCC: Fixed build
Browse files Browse the repository at this point in the history
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:

///{
///}
  • Loading branch information
skyjake committed Jan 28, 2012
1 parent c51e6b6 commit 7cd2c9f
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions doomsday/engine/portable/include/r_data.h
Expand Up @@ -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;
Expand Down

0 comments on commit 7cd2c9f

Please sign in to comment.