From 6cf25f92098c192d22dc82b9888386fa52b4d797 Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Sun, 29 Sep 2013 12:56:48 +0200 Subject: [PATCH] Clean up warnings in luasocket and box2d --- src/libraries/Box2D/Collision/Shapes/b2ChainShape.h | 7 +++++-- src/libraries/Box2D/README.MODIFIED | 1 + src/libraries/luasocket/libluasocket/luasocket.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 src/libraries/Box2D/README.MODIFIED diff --git a/src/libraries/Box2D/Collision/Shapes/b2ChainShape.h b/src/libraries/Box2D/Collision/Shapes/b2ChainShape.h index d7c5b2924..046a29890 100755 --- a/src/libraries/Box2D/Collision/Shapes/b2ChainShape.h +++ b/src/libraries/Box2D/Collision/Shapes/b2ChainShape.h @@ -14,6 +14,9 @@ * 2. Altered source versions must be plainly marked as such, and must not be * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. +* +* +* THIS FILE HAS BEEN MODIFIED BY THE LÖVE DEVELOPMENT TEAM */ #ifndef B2_CHAIN_SHAPE_H @@ -95,8 +98,8 @@ inline b2ChainShape::b2ChainShape() m_radius = b2_polygonRadius; m_vertices = NULL; m_count = 0; - m_hasPrevVertex = NULL; - m_hasNextVertex = NULL; + m_hasPrevVertex = false; + m_hasNextVertex = false; } #endif diff --git a/src/libraries/Box2D/README.MODIFIED b/src/libraries/Box2D/README.MODIFIED new file mode 100644 index 000000000..71388bce0 --- /dev/null +++ b/src/libraries/Box2D/README.MODIFIED @@ -0,0 +1 @@ +PLEASE NOTE, this version of Box2D is NOT original, it has been MODIFIED by the LÖVE Development Team. diff --git a/src/libraries/luasocket/libluasocket/luasocket.c b/src/libraries/luasocket/libluasocket/luasocket.c index 798a3116d..0d10bb1de 100644 --- a/src/libraries/luasocket/libluasocket/luasocket.c +++ b/src/libraries/luasocket/libluasocket/luasocket.c @@ -110,7 +110,7 @@ static int base_open(lua_State *L) { /*-------------------------------------------------------------------------*\ * Initializes all library modules. \*-------------------------------------------------------------------------*/ -LUASOCKET_API luaopen_socket_core(lua_State *L) { +int LUASOCKET_API luaopen_socket_core(lua_State *L) { int i; base_open(L); for (i = 0; mod[i].name; i++) mod[i].func(L);