Get rid of underscore defines. They are reserved by the standard.

actorid
scrawl 11 years ago
parent b8e9343764
commit c004fb778f

@ -1,5 +1,5 @@
#ifndef _MWINPUT_MWINPUTMANAGERIMP_H #ifndef MWINPUT_MWINPUTMANAGERIMP_H
#define _MWINPUT_MWINPUTMANAGERIMP_H #define MWINPUT_MWINPUTMANAGERIMP_H
#include "../mwgui/mode.hpp" #include "../mwgui/mode.hpp"

@ -1,5 +1,5 @@
#ifndef _GAME_RENDER_ACTIVATORANIMATION_H #ifndef GAME_RENDER_ACTIVATORANIMATION_H
#define _GAME_RENDER_ACTIVATORANIMATION_H #define GAME_RENDER_ACTIVATORANIMATION_H
#include "animation.hpp" #include "animation.hpp"

@ -1,5 +1,5 @@
#ifndef _GAME_RENDER_ACTORS_H #ifndef GAME_RENDER_ACTORS_H
#define _GAME_RENDER_ACTORS_H #define GAME_RENDER_ACTORS_H
#include <openengine/ogre/renderer.hpp> #include <openengine/ogre/renderer.hpp>

@ -1,5 +1,5 @@
#ifndef _GAME_RENDER_ANIMATION_H #ifndef GAME_RENDER_ANIMATION_H
#define _GAME_RENDER_ANIMATION_H #define GAME_RENDER_ANIMATION_H
#include <OgreController.h> #include <OgreController.h>
#include <OgreVector3.h> #include <OgreVector3.h>

@ -1,5 +1,5 @@
#ifndef _GAME_RENDER_CREATUREANIMATION_H #ifndef GAME_RENDER_CREATUREANIMATION_H
#define _GAME_RENDER_CREATUREANIMATION_H #define GAME_RENDER_CREATUREANIMATION_H
#include "animation.hpp" #include "animation.hpp"

@ -1,5 +1,5 @@
#ifndef _GAME_RENDER_MWSCENE_H #ifndef GAME_RENDER_MWSCENE_H
#define _GAME_RENDER_MWSCENE_H #define GAME_RENDER_MWSCENE_H
#include <utility> #include <utility>
#include <openengine/ogre/renderer.hpp> #include <openengine/ogre/renderer.hpp>

@ -1,5 +1,5 @@
#ifndef _GAME_RENDER_GLOBALMAP_H #ifndef GAME_RENDER_GLOBALMAP_H
#define _GAME_RENDER_GLOBALMAP_H #define GAME_RENDER_GLOBALMAP_H
#include <string> #include <string>

@ -1,5 +1,5 @@
#ifndef _GAME_RENDER_LOCALMAP_H #ifndef GAME_RENDER_LOCALMAP_H
#define _GAME_RENDER_LOCALMAP_H #define GAME_RENDER_LOCALMAP_H
#include <openengine/ogre/renderer.hpp> #include <openengine/ogre/renderer.hpp>

@ -1,5 +1,5 @@
#ifndef _GAME_RENDER_NPCANIMATION_H #ifndef GAME_RENDER_NPCANIMATION_H
#define _GAME_RENDER_NPCANIMATION_H #define GAME_RENDER_NPCANIMATION_H
#include "animation.hpp" #include "animation.hpp"

@ -1,5 +1,5 @@
#ifndef _GAME_RENDER_OBJECTS_H #ifndef GAME_RENDER_OBJECTS_H
#define _GAME_RENDER_OBJECTS_H #define GAME_RENDER_OBJECTS_H
#include <OgreColourValue.h> #include <OgreColourValue.h>
#include <OgreAxisAlignedBox.h> #include <OgreAxisAlignedBox.h>

@ -1,5 +1,5 @@
#ifndef _GAME_OCCLUSION_QUERY_H #ifndef GAME_OCCLUSION_QUERY_H
#define _GAME_OCCLUSION_QUERY_H #define GAME_OCCLUSION_QUERY_H
#include <OgreRenderObjectListener.h> #include <OgreRenderObjectListener.h>
#include <OgreRenderQueueListener.h> #include <OgreRenderQueueListener.h>

@ -1,5 +1,5 @@
#ifndef _GAME_RENDERING_INTERFACE_H #ifndef GAME_RENDERING_INTERFACE_H
#define _GAME_RENDERING_INTERFACE_H #define GAME_RENDERING_INTERFACE_H
namespace MWRender namespace MWRender
{ {

@ -1,5 +1,5 @@
#ifndef _GAME_RENDERING_MANAGER_H #ifndef GAME_RENDERING_MANAGER_H
#define _GAME_RENDERING_MANAGER_H #define GAME_RENDERING_MANAGER_H
#include "sky.hpp" #include "sky.hpp"
#include "debugging.hpp" #include "debugging.hpp"

@ -1,5 +1,5 @@
#ifndef _COMPONENTS_SETTINGS_H #ifndef COMPONENTS_SETTINGS_H
#define _COMPONENTS_SETTINGS_H #define COMPONENTS_SETTINGS_H
#include <OgreConfigFile.h> #include <OgreConfigFile.h>

@ -24,8 +24,8 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------- */ ------------------------------------------------------- */
#ifndef _Channel_H_ #ifndef OICS_Channel_H_
#define _Channel_H_ #define OICS_Channel_H_
#include "ICSPrerequisites.h" #include "ICSPrerequisites.h"

@ -24,8 +24,8 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------- */ ------------------------------------------------------- */
#ifndef _Control_H_ #ifndef OICS_Control_H_
#define _Control_H_ #define OICS_Control_H_
#include "ICSPrerequisites.h" #include "ICSPrerequisites.h"

@ -24,8 +24,8 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------- */ ------------------------------------------------------- */
#ifndef _InputControlSystem_H_ #ifndef OICS_InputControlSystem_H_
#define _InputControlSystem_H_ #define OICS_InputControlSystem_H_
#include "ICSPrerequisites.h" #include "ICSPrerequisites.h"

@ -1,5 +1,5 @@
#ifndef _OIS_SDL_COMPAT_H #ifndef OIS_SDL_COMPAT_H
#define _OIS_SDL_COMPAT_H #define OIS_SDL_COMPAT_H
#include <SDL_events.h> #include <SDL_events.h>
#include <SDL_types.h> #include <SDL_types.h>

@ -1,5 +1,5 @@
#ifndef _SDL4OGRE_CURSOR_MANAGER_H #ifndef SDL4OGRE_CURSOR_MANAGER_H
#define _SDL4OGRE_CURSOR_MANAGER_H #define SDL4OGRE_CURSOR_MANAGER_H
#include <SDL_types.h> #include <SDL_types.h>
#include <string> #include <string>

@ -1,5 +1,5 @@
#ifndef _SDL4OGRE_CURSORMANAGER_H #ifndef SDL4OGRE_CURSORMANAGER_H
#define _SDL4OGRE_CURSORMANAGER_H #define SDL4OGRE_CURSORMANAGER_H
#include <SDL.h> #include <SDL.h>

@ -1,5 +1,5 @@
#ifndef _SDL4OGRE_SDLINPUTWRAPPER_H #ifndef SDL4OGRE_SDLINPUTWRAPPER_H
#define _SDL4OGRE_SDLINPUTWRAPPER_H #define SDL4OGRE_SDLINPUTWRAPPER_H
#include <SDL_events.h> #include <SDL_events.h>

@ -13,8 +13,8 @@
* ===================================================================================== * =====================================================================================
*/ */
#ifndef _BtOgreShapes_H_ #ifndef BtOgreShapes_H_
#define _BtOgreShapes_H_ #define BtOgreShapes_H_
#include "btBulletDynamicsCommon.h" #include "btBulletDynamicsCommon.h"
#include "OgreSimpleRenderable.h" #include "OgreSimpleRenderable.h"

@ -14,8 +14,8 @@
* ===================================================================================== * =====================================================================================
*/ */
#ifndef _BtOgrePG_H_ #ifndef BtOgrePG_H_
#define _BtOgrePG_H_ #define BtOgrePG_H_
#include "btBulletDynamicsCommon.h" #include "btBulletDynamicsCommon.h"
#include "BtOgreExtras.h" #include "BtOgreExtras.h"

@ -14,8 +14,8 @@
* ===================================================================================== * =====================================================================================
*/ */
#ifndef _BtOgreGP_H_ #ifndef BtOgreGP_H_
#define _BtOgreGP_H_ #define BtOgreGP_H_
#include "btBulletDynamicsCommon.h" #include "btBulletDynamicsCommon.h"
#include "OgreSceneNode.h" #include "OgreSceneNode.h"

@ -1,5 +1,5 @@
#ifndef _BULLET_SHAPE_LOADER_H_ #ifndef OPENMW_BULLET_SHAPE_LOADER_H_
#define _BULLET_SHAPE_LOADER_H_ #define OPENMW_BULLET_SHAPE_LOADER_H_
#include <OgreResource.h> #include <OgreResource.h>
#include <OgreResourceManager.h> #include <OgreResourceManager.h>

Loading…
Cancel
Save