Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

gcc fixes

Browse source
This commit is contained in:
Enno Rehling 2010-02-15 04:03:24 +00:00
parent 198bb82c52
commit 319bc940b0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/gamecode/report.c
View file

@ -1790,7 +1790,6 @@ nr_ship(FILE * F, const seen_region * sr, const ship * sh, const faction * f, co
static void static void
nr_building(FILE *F, const seen_region * sr, const building * b, const faction * f) nr_building(FILE *F, const seen_region * sr, const building * b, const faction * f)
{ {
region * r = sr->r;
int i, bytes; int i, bytes;
const char * name, * bname, * billusion = NULL; const char * name, * bname, * billusion = NULL;
const struct locale * lang = NULL; const struct locale * lang = NULL;

5
src/external/bson/platform_hacks.h vendored
View file

@ -7,6 +7,7 @@
#ifdef __GNUC__ #ifdef __GNUC__
#define MONGO_INLINE static __inline__ #define MONGO_INLINE static __inline__
#define MONGO_HAVE_STDINT
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#define MONGO_USE__INT64 #define MONGO_USE__INT64
#define MONGO_INLINE __inline #define MONGO_INLINE __inline
@ -71,8 +72,8 @@ MONGO_INLINE void bson_swap_endian32(void* outp, const void* inp){
#define bson_big_endian32(out, in) ( memcpy(out, &in, 4) ) #define bson_big_endian32(out, in) ( memcpy(out, &in, 4) )
#else #else
#ifdef NDEBUG #ifdef NDEBUG
#define bson_little_endian64(out, in) ( memcpy(out, &in, 8) ) #define bson_little_endian64(out, in) { *(int64_t*)out = in; }
#define bson_little_endian32(out, in) ( memcpy(out, &in, 4) ) #define bson_little_endian32(out, in) { *(int32_t*)out = in; }
#define bson_big_endian64(out, in) ( bson_swap_endian64(out, &in) ) #define bson_big_endian64(out, in) ( bson_swap_endian64(out, &in) )
#define bson_big_endian32(out, in) ( bson_swap_endian32(out, &in) ) #define bson_big_endian32(out, in) ( bson_swap_endian32(out, &in) )
#else #else