From bbb2b60a2a2a9d3d3386b8e9093d962882ded84c Mon Sep 17 00:00:00 2001
From: Scott Ludwig <scottlu@gmail.com>
Date: Fri, 1 Jan 2016 23:09:50 -0800
Subject: [PATCH] Switch OS X build to 64 bit and fix a merge bug

---
 server/Makefile   | 6 +++---
 server/player.cpp | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/server/Makefile b/server/Makefile
index b680b1c..f08c2a0 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -3,8 +3,8 @@
 # gcc is silent.
 UNAME := $(shell uname)
 ifeq ($(UNAME), Darwin)
-PRE_CC=g++ -m32
-CC=$(PRE_CC) -Wshorten-64-to-32 -DOSX
+PRE_CC=g++
+CC=$(PRE_CC) -DOSX
 endif
 ifeq ($(UNAME), Linux)
 PRE_CC=g++
@@ -84,5 +84,5 @@ $(YAJLFILESCPP:%=$(OUTDIR)/%.o): $(YAJLFILESCPP:%=../yajl/wrapper/%.cpp)
 	$(CC) $(CPPFLAGS) -c $(<D)/$(*F).cpp -o $@
 
 $(YAJLFILESC:%=$(OUTDIR)/%.o): $(YAJLFILESC:%=../yajl/src/%.c)
-	$(CC) $(CPPFLAGS) -c $(<D)/$(*F).c -o $@
+	$(CC) $(CPPFLAGS) -x c -c $(<D)/$(*F).c -o $@
 
diff --git a/server/player.cpp b/server/player.cpp
index 2ade0f9..997c546 100644
--- a/server/player.cpp
+++ b/server/player.cpp
@@ -33,7 +33,6 @@ void Player::Init(Pid pid) {
     memset(alatr_, 0, sizeof(alatr_));
     memset(&ws_, 0, sizeof(ws_));
     memset(did_, 0, sizeof(did_));
-    return true;
 }
 
 void Player::SetEndpoint(Endpoint *endpoint) {