haikuprojects/Yab2Cpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86_64 build fix

Browse Source
This commit is contained in:
Jerome Duval
2017-01-30 19:28:47 +01:00
parent 786b55591d
commit ef330144dc
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile
View File

@@ -21,7 +21,7 @@ HAIKUOPT = -DHAIKU -DLIBRARY_PATH=\"`finddir B_USER_SETTINGS_DIRECTORY`/yab\"
## ##
## Find haiku systenm archetecture from the package file name ## 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 else
LD = ld LD = ld
endif endif
ifeq ($(SYSTEMARCH),x86_64)
LD=gcc
endif
# #
LD_OPT = -shared LD_OPT = -shared
@@ -178,4 +181,4 @@ install: yab $(YABLIBRARY)
cp -f yab /boot/system/non-packaged/bin$(ARCHADD)/ 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/lib$(ARCHADD)/
cp -f $(YABLIBRARY) /boot/system/non-packaged/develop/lib$(ARCHADD)/ cp -f $(YABLIBRARY) /boot/system/non-packaged/develop/lib$(ARCHADD)/

6
src/YabInterface.cpp
View File

@@ -123,7 +123,7 @@ int32 interpreter(void *data)
char **argv; char **argv;
YabInterface *yab; YabInterface *yab;
BList *myData = (BList*)data; BList *myData = (BList*)data;
argc = (int)myData->ItemAt(0); argc = (int)(addr_t)myData->ItemAt(0);
argv = (char**)myData->ItemAt(1); argv = (char**)myData->ItemAt(1);
yab = (YabInterface*)myData->ItemAt(2); yab = (YabInterface*)myData->ItemAt(2);
@@ -160,7 +160,7 @@ YabInterface::YabInterface(int argc, char **argv, const char* signature)
localMessage = ""; localMessage = "";
BList *myData = new BList(3); BList *myData = new BList(3);
myData->AddItem((void*)argc); myData->AddItem((void*)(addr_t)argc);
myData->AddItem((void*)argv); myData->AddItem((void*)argv);
myData->AddItem((void*)this); myData->AddItem((void*)this);
myThread = spawn_thread(interpreter,"YabInterpreter",B_NORMAL_PRIORITY,(void*)myData); 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* YabInterface::ClipboardPaste()
{ {
const char *text; const char *text;
int32 textlen; ssize_t textlen;
BString returnstring; BString returnstring;
BMessage *clip = (BMessage *)NULL; BMessage *clip = (BMessage *)NULL;

4
src/YabList.cpp
View File

@@ -38,7 +38,7 @@ void YabList::AddView(const char* id, const BView* view, int type)
{ {
idList->AddItem((void*)new BString(id)); idList->AddItem((void*)new BString(id));
viewList->AddItem((void*)view); viewList->AddItem((void*)view);
typeList->AddItem((void*)type); typeList->AddItem((void*)(addr_t)type);
} }
void YabList::DelView(const char* id) void YabList::DelView(const char* id)
@@ -70,7 +70,7 @@ const void* YabList::GetView(const char* id)
const int YabList::GetType(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() const int YabList::CountItems()

4
src/column/ColumnListView.cpp
View File

@@ -502,7 +502,7 @@ BRow::BRow(float height)
BRow::~BRow() BRow::~BRow()
{ {
while (true) { while (true) {
BField* field = (BField*) fFields.RemoveItem(0L); BField* field = (BField*) fFields.RemoveItem((int32)0);
if (field == 0) if (field == 0)
break; break;
@@ -798,7 +798,7 @@ BColumnListView::BColumnListView(const char* name, uint32 flags,
BColumnListView::~BColumnListView() BColumnListView::~BColumnListView()
{ {
while (BColumn* column = (BColumn*)fColumns.RemoveItem(0L)) while (BColumn* column = (BColumn*)fColumns.RemoveItem((int32)0))
delete column; delete column;
} }