mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 22:15:32 +00:00
Code Issues Releases Wiki Activity

Cleaned up strnlen in esm_reader. Added -Werror switch to g++.

Browse source
This commit is contained in:
Nicolay Korslund 2010-09-07 10:40:00 +02:00
parent e30306f7c3
commit 5552c44753
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -247,7 +247,7 @@ endif (APPLE)
# Compiler settings # Compiler settings
if (CMAKE_COMPILER_IS_GNUCC) if (CMAKE_COMPILER_IS_GNUCC)
add_definitions (-Wall) add_definitions (-Wall -Werror)
endif (CMAKE_COMPILER_IS_GNUCC) endif (CMAKE_COMPILER_IS_GNUCC)
# Apple bundling # Apple bundling

12
components/esm/esm_reader.hpp
View file

@ -3,10 +3,10 @@
#include <string> #include <string>
#include <libs/platform/stdint.h> #include <libs/platform/stdint.h>
#include <libs/platform/string.h>
#include <assert.h> #include <assert.h>
#include <vector> #include <vector>
#include <sstream> #include <sstream>
#include <string.h>
#include <stdexcept> #include <stdexcept>
#include <libs/mangle/stream/stream.hpp> #include <libs/mangle/stream/stream.hpp>
@ -15,16 +15,6 @@
#include <components/to_utf8/to_utf8.hpp> #include <components/to_utf8/to_utf8.hpp>
#ifdef __APPLE__
// need our own implementation of strnlen
static size_t strnlen(const char *s, size_t n)
{
const char *p = (const char *)memchr(s, 0, n);
return(p ? p-s : n);
}
#endif
namespace ESM { namespace ESM {
enum Version enum Version

14
libs/platform/string.h Normal file
View file

@ -0,0 +1,14 @@
// Wrapper for string.h on Mac
#ifndef _STRING_WRAPPER_H
#define _STRING_WRAPPER_H
#include <string.h>
#ifdef __APPLE__
// need our own implementation of strnlen
static size_t strnlen(const char *s, size_t n)
{
const char *p = (const char *)memchr(s, 0, n);
return(p ? p-s : n);
}
#endif
#endif