Skip to content

Commit 48bb1ae

Browse files
committed
Haiku: 32bit fixes
For historical reasons int32 and int32_t are not compatible types.
1 parent f3e54f3 commit 48bb1ae

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/detection/cpu/cpu_haiku.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const char* ffDetectCPUImpl(FF_MAYBE_UNUSED const FFCPUOptions* options, FFCPURe
1010
if (get_system_info(&sysInfo) != B_OK)
1111
return "get_system_info() failed";
1212

13-
uint32_t topoNodeCount = 0;
13+
uint32 topoNodeCount = 0;
1414
get_cpu_topology_info(NULL, &topoNodeCount);
1515
if (topoNodeCount == 0)
1616
return "get_cpu_topology_info(NULL) failed";

src/detection/disk/disk_haiku.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ extern "C"
88

99
const char* ffDetectDisksImpl(FF_MAYBE_UNUSED FFDiskOptions* options, FF_MAYBE_UNUSED FFlist* disks)
1010
{
11-
int pos = 0;
11+
int32 pos = 0;
1212

1313
for (dev_t dev; (dev = next_dev(&pos)) >= B_OK;)
1414
{

src/detection/sound/sound_haiku.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const char* ffDetectSound(FF_MAYBE_UNUSED FFlist* devices /* List of FFSoundDevi
1111

1212
roster->GetAudioOutput(&mediaNode);
1313

14-
int32_t mediaOutputCount = 0;
14+
int32 mediaOutputCount = 0;
1515
roster->GetAllOutputsFor(mediaNode, NULL, 0, &mediaOutputCount);
1616
if (mediaOutputCount == 0)
1717
return NULL;

0 commit comments

Comments
 (0)