cpp/openttd-patchpack/source Changeset - r23406:7bed336a12bb

Changeset - r23406:7bed336a12bb

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Patric Stout - 6 years ago 2019-03-04 18:33:59
truebrain@openttd.org

Codechange: removed some left-behind __NDS__ references

2 files changed with 1 insertions and 24 deletions:

src/core/alloc_type.hpp

src/stdafx.h

0 comments (0 inline, 0 general)

src/core/alloc_type.hpp

➞

Show inline comments

@@ @@ -25,24 +25,8 @@ @@
  */
 template <typename T, size_t length>
 struct SmallStackSafeStackAlloc {
 #if !defined(__NDS__)
 	/** Storing the data on the stack */
 	T data[length];
 #else
 	/** Storing it on the heap */
 	T *data;
 	/** The length (in elements) of data in this allocator. */
 	size_t len;
 	/** Allocating the memory */
 	SmallStackSafeStackAlloc() : data(MallocT<T>(length)), len(length) {}
 	/** And freeing when it goes out of scope */
 	~SmallStackSafeStackAlloc()
+	{
 		free(data);
+	}
 #endif
 	/**
 	 * Gets a pointer to the data stored in this wrapper.
@@ @@ -69,11 +53,7 @@ struct SmallStackSafeStackAlloc { @@
 	 */
 	inline T *EndOf()
+	{
 #if !defined(__NDS__)
 		return endof(data);
 #else
 		return &data[len];
 #endif
+	}
 };

src/stdafx.h

➞

Show inline comments

@@ @@ -22,9 +22,6 @@ @@
 	#define _GNU_SOURCE
 	#define TROUBLED_INTS
 	#include <strings.h>
 #elif defined(__NDS__)
 	#include <nds/jtypes.h>
 	#define TROUBLED_INTS
 #endif
 /* It seems that we need to include stdint.h before anything else
@@ @@ -433,7 +430,7 @@ void NORETURN CDECL error(const char *st @@
 	#define OTTD_ASSERT
 #endif
-#if defined(__NDS__) || defined(__DJGPP__)
 #if defined(__DJGPP__)
 	/* DJGPP doesn't have C++ conformant _stricmp... */
 	#define _stricmp stricmp
 #elif defined(OPENBSD)

0 comments (0 inline, 0 general)