mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 06:28:55 +02:00
53 lines
1.4 KiB
Plaintext
53 lines
1.4 KiB
Plaintext
From 6f52bc369f939bfb161e44dd9b18f8b90e73442c Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Sat, 28 Jan 2017 15:12:06 +0100
|
|
Subject: x86_64 build fix
|
|
|
|
|
|
diff --git a/Source/stApp.cpp b/Source/stApp.cpp
|
|
index 7c18c64..dc92513 100644
|
|
--- a/Source/stApp.cpp
|
|
+++ b/Source/stApp.cpp
|
|
@@ -7,7 +7,7 @@ Distributed under the terms of the MIT Licence. */
|
|
|
|
#include <FilePanel.h>
|
|
|
|
-char defsong [] = {
|
|
+uchar defsong [] = {
|
|
#include "Source/data/defaultsong.h"
|
|
};
|
|
|
|
@@ -39,7 +39,7 @@ void stApp::AboutRequested()
|
|
void stApp::ReadyToRun()
|
|
{
|
|
if ( dropped ) return;
|
|
- txt t(defsong,(int)sizeof(defsong));
|
|
+ txt t((char*)defsong,(int)sizeof(defsong));
|
|
stMainWindow *win=new stMainWindow(BRect(10,29,450,150),t);
|
|
win->Show();
|
|
win->Activate();
|
|
@@ -53,7 +53,7 @@ void stApp::MessageReceived(BMessage *message)
|
|
break;
|
|
case ST_NEW_SONG:
|
|
{
|
|
- txt t(defsong,(int)sizeof(defsong));
|
|
+ txt t((char*)defsong,(int)sizeof(defsong));
|
|
stMainWindow *win = new stMainWindow(BRect(10,29,450,150),t);
|
|
win->Show();
|
|
win->Activate();
|
|
diff --git a/lib/source/song.cpp b/lib/source/song.cpp
|
|
index bc8247f..5d1e853 100644
|
|
--- a/lib/source/song.cpp
|
|
+++ b/lib/source/song.cpp
|
|
@@ -4,6 +4,7 @@ Distributed under the terms of the MIT Licence. */
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <math.h>
|
|
+#define __STDC_FORMAT_MACROS
|
|
#include <inttypes.h> // for PRIu32
|
|
|
|
#include "stSong.h"
|
|
--
|
|
2.10.2
|
|
|