Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for warnings in Linux.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3264 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2010-05-02 12:49:51 +00:00
parent 12016a853b
commit 78f970e834
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/OOCache.m
View File

@ -422,9 +422,9 @@ static NSString *CacheNodeGetDescription(OOCacheNode *node);
static OOCacheNode *TreeSplay(OOCacheNode **root, id<OOCacheComparable> key);
static OOCacheNode *TreeInsert(OOCacheImpl *cache, id<OOCacheComparable> key, id value);
static unsigned TreeCountNodes(OOCacheNode *node);
#if OOCACHE_PERFORM_INTEGRITY_CHECKS
static unsigned TreeCountNodes(OOCacheNode *node);
static OOCacheNode *TreeCheckIntegrity(OOCacheImpl *cache, OOCacheNode *node, OOCacheNode *expectedParent, NSString *context);
#endif
@ -795,6 +795,7 @@ static OOCacheNode *TreeInsert(OOCacheImpl *cache, id<OOCacheComparable> key, id
}
#if OOCACHE_PERFORM_INTEGRITY_CHECKS
static unsigned TreeCountNodes(OOCacheNode *node)
{
if (node == NULL) return 0;
@ -802,7 +803,6 @@ static unsigned TreeCountNodes(OOCacheNode *node)
}
#if OOCACHE_PERFORM_INTEGRITY_CHECKS
// TreeCheckIntegrity(): verify the links and contents of a (sub-)tree. If successful, returns the root of the subtree (which could theoretically be changed), otherwise returns NULL.
static OOCacheNode *TreeCheckIntegrity(OOCacheImpl *cache, OOCacheNode *node, OOCacheNode *expectedParent, NSString *context)
{

2
src/Core/OOPlanetData.h
View File

@ -7,7 +7,7 @@
This data may be used freely.
*/
#import "OOOpenGLOnly.h"
#include "OOOpenGLOnly.h"
#define kOOPlanetDataLevels 6

4
src/Core/legacy_random.h
View File

@ -28,8 +28,8 @@ MA 02110-1301, USA.
#ifndef LEGACY_RANDOM_H
#define LEGACY_RANDOM_H
#import "OOFunctionAttributes.h"
#import <math.h>
#include "OOFunctionAttributes.h"
#include <math.h>
typedef struct Random_Seed

2
tools/icosmesh/main.m
View File

@ -152,7 +152,7 @@ static void WritePrelude(FILE *header, FILE *source)
"\tThis data may be used freely.\n"
"*/\n"
"\n"
"#import \"OOOpenGLOnly.h\"\n"
"#include \"OOOpenGLOnly.h\"\n"
"\n"
"\n"
"#define kOOPlanetDataLevels %u\n"