C compatible types

diff --git a/include/EDriverTypes.h b/include/EDriverTypes.h
index 174889093609c7f36b4f38c593baaa2b29d44236..cc1a8227978c42a66819d61fdd04fec5f903ad0f 100644 (file)
--- a/include/EDriverTypes.h
+++ b/include/EDriverTypes.h
@@ -22,7 +22,7 @@
 #ifndef __C_E_DRIVER_TYPES_H_INCLUDED__
 #define __C_E_DRIVER_TYPES_H_INCLUDED__
 
-enum irr_video_E_DRIVER_TYPE
+typedef enum
   {
    irr_video_EDT_NULL,
    irr_video_EDT_SOFTWARE,
@@ -31,6 +31,6 @@ enum irr_video_E_DRIVER_TYPE
    irr_video_EDT_DIRECT3D9,
    irr_video_EDT_OPENGL,
    irr_video_EDT_COUNT
-  };
+  } irr_video_E_DRIVER_TYPE;
 
 #endif

diff --git a/include/EMaterialFlags.h b/include/EMaterialFlags.h
index 47f9b26310d8548ccae3ff51cdbe584159805562..51157f27c4d1f760f005c767ad205cdc4b9cbe66 100644 (file)
--- a/include/EMaterialFlags.h
+++ b/include/EMaterialFlags.h
@@ -22,7 +22,7 @@
 #ifndef __C_E_MATERIAL_FLAGS_H_INCLUDED__
 #define __C_E_MATERIAL_FLAGS_H_INCLUDED__
 
-enum irr_video_E_MATERIAL_FLAG
+typedef enum
   {
    irr_video_EMF_WIREFRAME = 0x1,
    irr_video_EMF_POINTCLOUD = 0x2,
@@ -44,6 +44,6 @@ enum irr_video_E_MATERIAL_FLAG
    irr_video_EMF_USE_MIP_MAPS = 0x20000,
    irr_video_EMF_BLEND_OPERATION = 0x40000,
    irr_video_EMF_POLYGON_OFFSET = 0x80000
-  };
+  } irr_video_E_MATERIAL_FLAG;
 
 #endif

diff --git a/include/IAnimatedMeshMD2.h b/include/IAnimatedMeshMD2.h
index c9b84c9bf043abc0c719a2cda837c834aa71f42d..f5f96d9721506e8d7100f62e8017ebdba305a2fd 100644 (file)
--- a/include/IAnimatedMeshMD2.h
+++ b/include/IAnimatedMeshMD2.h
@@ -22,7 +22,7 @@
 #ifndef __C_I_ANIMATED_MESH_MD2_H_INCLUDED__
 #define __C_I_ANIMATED_MESH_MD2_H_INCLUDED__
 
-enum irr_scene_EMD2_ANIMATION_TYPE
+typedef enum
   {
    irr_scene_EMAT_STAND = 0,
    irr_scene_EMAT_RUN,
@@ -46,6 +46,6 @@ enum irr_scene_EMD2_ANIMATION_TYPE
    irr_scene_EMAT_DEATH_FALLBACKSLOW,
    irr_scene_EMAT_BOOM,
    irr_scene_EMAT_COUNT
-  };
+  } irr_scene_EMD2_ANIMATION_TYPE;
 
 #endif

diff --git a/include/IAnimatedMeshSceneNode.h b/include/IAnimatedMeshSceneNode.h
index 34c3dc77743b5e02d319f53ef6ce66f2edd9d13a..27f2f5deae6151ddbb5a8bb2fe87200c477a07ba 100644 (file)
--- a/include/IAnimatedMeshSceneNode.h
+++ b/include/IAnimatedMeshSceneNode.h
@@ -35,14 +35,14 @@ extern "C" {
   void
   irr_scene_IAnimatedMeshSceneNode_setMaterialFlag(irr_scene_IAnimatedMeshSceneNode* node,
                                                    irr_video_E_MATERIAL_FLAG flag,
-                                                   bool newvalue);
+                                                   int newvalue);
 
   void
   irr_scene_IAnimatedMeshSceneNode_setMaterialTexture(irr_scene_IAnimatedMeshSceneNode* node,
-                                                      u_int32_t textureLayer,
+                                                      unsigned int textureLayer,
                                                       irr_video_ITexture* texture);
 
-  bool
+  int
   irr_scene_IAnimatedMeshSceneNode_setMD2Animation(irr_scene_IAnimatedMeshSceneNode* node,
                                                    irr_scene_EMD2_ANIMATION_TYPE anim);
 

diff --git a/include/IGUIEnvironment.h b/include/IGUIEnvironment.h
index 721d02919ec4d9539e31120ce4c64beabdec11c6..8cb15b33d1ac588d54a1c717fddb2ce88bb89bf0 100644 (file)
--- a/include/IGUIEnvironment.h
+++ b/include/IGUIEnvironment.h
@@ -36,11 +36,11 @@ extern "C" {
   irr_gui_IGUIEnvironment_addStaticText(irr_gui_IGUIEnvironment* guienv,
                                         const char* text,
                                         const irr_core_rect_s32* rectangle,
-                                        bool border,
-                                        bool wordWrap,
+                                        int border,
+                                        int wordWrap,
                                         irr_gui_IGUIElement* parent,
-                                        int32_t id,
-                                        bool fillBackground);
+                                        int id,
+                                        int fillBackground);
 
   void
   irr_gui_IGUIEnvironment_drawAll(irr_gui_IGUIEnvironment* guienv);

diff --git a/include/ISceneManager.h b/include/ISceneManager.h
index 7d0d04db92e7f04db4045ace87798ccc6366b677..0be8e3c6604eb06d58ec3b7981474ad507a0803e 100644 (file)
--- a/include/ISceneManager.h
+++ b/include/ISceneManager.h
@@ -38,19 +38,19 @@ extern "C" {
   irr_scene_ISceneManager_addAnimatedMeshSceneNode(irr_scene_ISceneManager* smgr,
                                                    irr_scene_IAnimatedMesh* mesh,
                                                    irr_scene_ISceneNode* parent,
-                                                   int32_t id,
+                                                   int id,
                                                    irr_core_vector3df* position,
                                                    irr_core_vector3df* rotation,
                                                    irr_core_vector3df* scale,
-                                                   bool alsoAddIfMeshPointerZero);
+                                                   int alsoAddIfMeshPointerZero);
 
   irr_scene_ICameraSceneNode*
   irr_scene_ISceneManager_addCameraSceneNode(irr_scene_ISceneManager* smgr,
                                              irr_scene_ISceneNode* parent,
                                              irr_core_vector3df* position,
                                              irr_core_vector3df* lookat,
-                                             int32_t id,
-                                             bool makeActive);
+                                             int id,
+                                             int makeActive);
 
   void
   irr_scene_ISceneManager_drawAll(irr_scene_ISceneManager* smgr);

diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h
index ea9ef5162d31b1da9c913334b7acfb56d9f896a5..98a837e163771e506aa52cf960aa98fbb778dfef 100644 (file)
--- a/include/IVideoDriver.h
+++ b/include/IVideoDriver.h
@@ -33,15 +33,15 @@ typedef void irr_video_IVideoDriver;
 extern "C" {
 #endif
 
-  bool
+  int
   irr_video_IVideoDriver_beginScene(irr_video_IVideoDriver* driver,
-                                    bool backBuffer,
-                                    bool zBuffer,
+                                    int backBuffer,
+                                    int zBuffer,
                                     const irr_video_SColor* color,
                                     irr_video_SExposedVideoData* videoData,
                                     const irr_core_rect_s32* sourceRect);
 
-  bool
+  int
   irr_video_IVideoDriver_endScene(irr_video_IVideoDriver* driver);
 
   irr_video_ITexture*

diff --git a/include/SColor.h b/include/SColor.h
index f9657b3133a6f5b5e8a17f1cf161dbee384af3a8..4409a74e7c4872ef6e99c75adcaf348ea98ff95b 100644 (file)
--- a/include/SColor.h
+++ b/include/SColor.h
@@ -24,10 +24,10 @@
 
 typedef struct
 {
-  u_int32_t a;
-  u_int32_t r;
-  u_int32_t g;
-  u_int32_t b;
+  unsigned int a;
+  unsigned int r;
+  unsigned int g;
+  unsigned int b;
 } irr_video_SColor;
 
 #endif

diff --git a/include/cirrlicht.h b/include/cirrlicht.h
index 8faa0e3de020d5d3fc31247545e242831a9e8f5a..a7a46226418e3d318a99d688cc7809fc271c3d7a 100644 (file)
--- a/include/cirrlicht.h
+++ b/include/cirrlicht.h
@@ -48,10 +48,10 @@ extern "C" {
   irr_IrrlichtDevice*
   irr_createDevice(irr_video_E_DRIVER_TYPE deviceType,
                    const irr_core_dimension2d_u32* windowSize,
-                   u_int32_t bits,
-                   bool fullscreen,
-                   bool stencilbuffer,
-                   bool vsync);
+                   unsigned int bits,
+                   int fullscreen,
+                   int stencilbuffer,
+                   int vsync);
 
 #ifdef __cplusplus
 }

diff --git a/include/dimension2d.h b/include/dimension2d.h
index 118c7a334b179c7b38185451052979512ebb4634..1f2dacae0c7fe753b96b9ada052429b65b594552 100644 (file)
--- a/include/dimension2d.h
+++ b/include/dimension2d.h
@@ -24,8 +24,8 @@
 
 typedef struct
 {
-  u_int32_t width;
-  u_int32_t height;
+  unsigned int width;
+  unsigned int height;
 } irr_core_dimension2d_u32;
 
 #endif

diff --git a/include/rect.h b/include/rect.h
index 195281dfe1e646d00f49b77d22b7b9c35292cbbf..395446a216f88757858b3a5d7cb7639b36a9b83f 100644 (file)
--- a/include/rect.h
+++ b/include/rect.h
@@ -24,10 +24,10 @@
 
 typedef struct
 {
-  int32_t x;
-  int32_t y;
-  int32_t x2;
-  int32_t y2;
+  int x;
+  int y;
+  int x2;
+  int y2;
 } irr_core_rect_s32;
 
 #endif

diff --git a/include/vector3d.h b/include/vector3d.h
index 6019d94c753d9239594c5d2c721a8c6b4275f6b2..36de9a9e5dc101cdf105dc9627b4081be566d917 100644 (file)
--- a/include/vector3d.h
+++ b/include/vector3d.h
@@ -24,9 +24,9 @@
 
 typedef struct
 {
-  float_t x;
-  float_t y;
-  float_t z;
+  float x;
+  float y;
+  float z;
 } irr_core_vector3df;
 
 #endif

diff --git a/src/CIrrlicht.cpp b/src/CIrrlicht.cpp
index dc0c20d3a496fba0b1f7877ba452c5a39791c742..f04f999757649ca72d5a592383f66c42c31762d7 100644 (file)
--- a/src/CIrrlicht.cpp
+++ b/src/CIrrlicht.cpp
@@ -26,10 +26,10 @@ extern "C" {
   irr_IrrlichtDevice*
   irr_createDevice(irr_video_E_DRIVER_TYPE deviceType,
                    const irr_core_dimension2d_u32* windowSize,
-                   u_int32_t bits,
-                   bool fullscreen,
-                   bool stencilbuffer,
-                   bool vsync)
+                   unsigned int bits,
+                   int fullscreen,
+                   int stencilbuffer,
+                   int vsync)
   {
     irr::core::dimension2d<irr::u32> wsize =                    \
       irr::core::dimension2d<irr::u32>(windowSize->width,

diff --git a/src/IAnimatedMeshSceneNode.cpp b/src/IAnimatedMeshSceneNode.cpp
index 0a63c0f2cf5eaa3a0b90a1c35666a8b25cc517d5..f7348fc96f5c7ccf8897f2d4ece657ad71f9fbac 100644 (file)
--- a/src/IAnimatedMeshSceneNode.cpp
+++ b/src/IAnimatedMeshSceneNode.cpp
@@ -26,7 +26,7 @@ extern "C" {
   void
   irr_scene_IAnimatedMeshSceneNode_setMaterialFlag(irr_scene_IAnimatedMeshSceneNode* node,
                                                    irr_video_E_MATERIAL_FLAG flag,
-                                                   bool newvalue)
+                                                   int newvalue)
   {
     ((irr::scene::IAnimatedMeshSceneNode*)node)->setMaterialFlag((irr::video::E_MATERIAL_FLAG)flag,
                                                                  newvalue);
@@ -34,14 +34,14 @@ extern "C" {
 
   void
   irr_scene_IAnimatedMeshSceneNode_setMaterialTexture(irr_scene_IAnimatedMeshSceneNode* node,
-                                                      u_int32_t textureLayer,
+                                                      unsigned int textureLayer,
                                                       irr_video_ITexture* texture)
   {
     ((irr::scene::IAnimatedMeshSceneNode*)node)->setMaterialTexture(textureLayer,
                                                                     (irr::video::ITexture*)texture);
   }
 
-  bool
+  int
   irr_scene_IAnimatedMeshSceneNode_setMD2Animation(irr_scene_IAnimatedMeshSceneNode* node,
                                                    irr_scene_EMD2_ANIMATION_TYPE anim)
   {

diff --git a/src/IGUIEnvironment.cpp b/src/IGUIEnvironment.cpp
index 7f92386c26b5f5ad4786829cd79fc686ee481930..4a5d68b5d2b24234fa70f44e5287352b35779a78 100644 (file)
--- a/src/IGUIEnvironment.cpp
+++ b/src/IGUIEnvironment.cpp
@@ -28,11 +28,11 @@ extern "C" {
   irr_gui_IGUIEnvironment_addStaticText(irr_gui_IGUIEnvironment* guienv,
                                         const char* text,
                                         const irr_core_rect_s32* rectangle,
-                                        bool border,
-                                        bool wordWrap,
+                                        int border,
+                                        int wordWrap,
                                         irr_gui_IGUIElement* parent,
-                                        int32_t id,
-                                        bool fillBackground)
+                                        int id,
+                                        int fillBackground)
   {
     // Convert to wide char text
     wchar_t *wtext = (wchar_t*)malloc((strlen(text) + 1) * sizeof(wchar_t));

diff --git a/src/ISceneManager.cpp b/src/ISceneManager.cpp
index 8139f840cd6cee5408d588e08e56d156b92f3065..422250569e79de84edc543bece5061eb41ba2e03 100644 (file)
--- a/src/ISceneManager.cpp
+++ b/src/ISceneManager.cpp
@@ -27,11 +27,11 @@ extern "C" {
   irr_scene_ISceneManager_addAnimatedMeshSceneNode(irr_scene_ISceneManager* smgr,
                                                    irr_scene_IAnimatedMesh* mesh,
                                                    irr_scene_ISceneNode* parent,
-                                                   int32_t id,
+                                                   int id,
                                                    irr_core_vector3df* position,
                                                    irr_core_vector3df* rotation,
                                                    irr_core_vector3df* scale,
-                                                   bool alsoAddIfMeshPointerZero)
+                                                   int alsoAddIfMeshPointerZero)
   {
     const irr::core::vector3df& iPosition = irr::core::vector3df(position->x,
                                                                  position->y,
@@ -57,8 +57,8 @@ extern "C" {
                                              irr_scene_ISceneNode* parent,
                                              irr_core_vector3df* position,
                                              irr_core_vector3df* lookat,
-                                             int32_t id,
-                                             bool makeActive)
+                                             int id,
+                                             int makeActive)
   {
     const irr::core::vector3df& iPosition = irr::core::vector3df(position->x,
                                                                  position->y,

diff --git a/src/IVideoDriver.cpp b/src/IVideoDriver.cpp
index cf703b6aba01ffcc64305564b58ba2227217c9cf..ea27d4c735a7bb8184b9b59ace5fd0fe543c5692 100644 (file)
--- a/src/IVideoDriver.cpp
+++ b/src/IVideoDriver.cpp
@@ -23,10 +23,10 @@
 #include "IVideoDriver.h"
 
 extern "C" {
-  bool
+  int
   irr_video_IVideoDriver_beginScene(irr_video_IVideoDriver* driver,
-                                    bool backBuffer,
-                                    bool zBuffer,
+                                    int backBuffer,
+                                    int zBuffer,
                                     const irr_video_SColor* color,
                                     irr_video_SExposedVideoData* videoData,
                                     const irr_core_rect_s32* sourceRect)
@@ -57,7 +57,7 @@ extern "C" {
                                                            sourceRect != NULL ? &rect : 0);
   }
 
-  bool
+  int
   irr_video_IVideoDriver_endScene(irr_video_IVideoDriver* driver)
   {
     return ((irr::video::IVideoDriver*)driver)->endScene();