From ef330144dcb691f231e7e9cc95a2a20985467064 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 30 Jan 2017 19:28:47 +0100
Subject: [PATCH] x86_64 build fix

---
 src/Makefile                  | 7 +++++--
 src/YabInterface.cpp          | 6 +++---
 src/YabList.cpp               | 4 ++--
 src/column/ColumnListView.cpp | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 5e2aafd..16892ae 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -21,7 +21,7 @@ HAIKUOPT = -DHAIKU -DLIBRARY_PATH=\"`finddir B_USER_SETTINGS_DIRECTORY`/yab\"
 ##
 ## Find haiku systenm archetecture from the package file name
 ##
-SYSTEMARCH:= $(shell catattr SYS:PACKAGE_FILE /boot/system/kernel_x86|cut --fields=4 -d-|cut -d. --fields 1)
+SYSTEMARCH:= $(shell catattr SYS:PACKAGE_FILE /boot/system/kernel_x86*|cut --fields=4 -d-|cut -d. --fields 1)
 #
 
 ##
@@ -74,6 +74,9 @@ ifeq ($(USEDARCH), x86)
 else
 	LD = ld
 endif
+ifeq ($(SYSTEMARCH),x86_64)
+	LD=gcc
+endif
 #
 
 LD_OPT = -shared
@@ -178,4 +181,4 @@ install: yab $(YABLIBRARY)
 	cp -f yab /boot/system/non-packaged/bin$(ARCHADD)/
 	cp -f $(YABLIBRARY) /boot/system/non-packaged/lib$(ARCHADD)/
 	cp -f $(YABLIBRARY) /boot/system/non-packaged/develop/lib$(ARCHADD)/
-	
\ No newline at end of file
+	
diff --git a/src/YabInterface.cpp b/src/YabInterface.cpp
index 5cf2e2c..affdc14 100644
--- a/src/YabInterface.cpp
+++ b/src/YabInterface.cpp
@@ -123,7 +123,7 @@ int32 interpreter(void *data)
 	char **argv;
 	YabInterface *yab;
 	BList *myData = (BList*)data;
-	argc = (int)myData->ItemAt(0);
+	argc = (int)(addr_t)myData->ItemAt(0);
 	argv = (char**)myData->ItemAt(1);
 	yab = (YabInterface*)myData->ItemAt(2);
 
@@ -160,7 +160,7 @@ YabInterface::YabInterface(int argc, char **argv, const char* signature)
 	localMessage = "";
 
 	BList *myData = new BList(3);
-	myData->AddItem((void*)argc);
+	myData->AddItem((void*)(addr_t)argc);
 	myData->AddItem((void*)argv);
 	myData->AddItem((void*)this);
 	myThread = spawn_thread(interpreter,"YabInterpreter",B_NORMAL_PRIORITY,(void*)myData);
@@ -6431,7 +6431,7 @@ void YabInterface::PrinterConfig(const char* config)
 const char* YabInterface::ClipboardPaste()
 {
 	const char *text; 
-	int32 textlen; 
+	ssize_t textlen; 
 	BString returnstring; 
 	BMessage *clip = (BMessage *)NULL; 
 
diff --git a/src/YabList.cpp b/src/YabList.cpp
index cc2e95c..72b31fa 100644
--- a/src/YabList.cpp
+++ b/src/YabList.cpp
@@ -38,7 +38,7 @@ void YabList::AddView(const char* id, const BView* view, int type)
 {
 	idList->AddItem((void*)new BString(id));
 	viewList->AddItem((void*)view);
-	typeList->AddItem((void*)type);
+	typeList->AddItem((void*)(addr_t)type);
 }
 
 void YabList::DelView(const char* id)
@@ -70,7 +70,7 @@ const void* YabList::GetView(const char* id)
 
 const int YabList::GetType(const char* id)
 {
-	return (int)typeList->ItemAt(ViewNum(id));
+	return (int)(addr_t)typeList->ItemAt(ViewNum(id));
 }
 
 const int YabList::CountItems()
diff --git a/src/column/ColumnListView.cpp b/src/column/ColumnListView.cpp
index 150e3c4..2b997ce 100644
--- a/src/column/ColumnListView.cpp
+++ b/src/column/ColumnListView.cpp
@@ -502,7 +502,7 @@ BRow::BRow(float height)
 BRow::~BRow()
 {
 	while (true) {
-		BField* field = (BField*) fFields.RemoveItem(0L);
+		BField* field = (BField*) fFields.RemoveItem((int32)0);
 		if (field == 0)
 			break;
 
@@ -798,7 +798,7 @@ BColumnListView::BColumnListView(const char* name, uint32 flags,
 
 BColumnListView::~BColumnListView()
 {
-	while (BColumn* column = (BColumn*)fColumns.RemoveItem(0L))
+	while (BColumn* column = (BColumn*)fColumns.RemoveItem((int32)0))
 		delete column;
 }