i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed build for R5 : now uses inttypes.h because it's present on R5 also

Browse Source 
HaikuBuildCompatibily.h exposes INT64_MAX based on limits.h


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18900 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2006-09-21 12:29:49 +00:00
parent 5fe9705942
commit c332e7f74e
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/build/HaikuBuildCompatibility.h
+5
View File
@@ -67,5 +67,10 @@ extern float roundf(float value);
# define B_BAD_DATA (B_NOT_ALLOWED + 1) # define B_BAD_DATA (B_NOT_ALLOWED + 1)
#endif #endif
#ifndef INT64_MAX
#include <limits.h>
#define INT64_MAX LONGLONG_MAX
#endif
#endif // HAIKU_BUILD_COMPATIBILITY_H #endif // HAIKU_BUILD_COMPATIBILITY_H
src/kits/media/Jamfile
-8
View File
@@ -5,14 +5,6 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
if $(TARGET_PLATFORM) != haiku { if $(TARGET_PLATFORM) != haiku {
UseHeaders [ FDirName $(HAIKU_TOP) headers os media ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers os media ] : true ;
# We need the public media headers also when not compiling for Haiku. # We need the public media headers also when not compiling for Haiku.
UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;
# We need the public headers also when not compiling for Haiku.
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
# We need the public posix headers also when not compiling for Haiku.
UseHeaders [ FDirName $(HAIKU_TOP) headers os support ] : true ;
# We need the public support headers also when not compiling for Haiku.
UseHeaders [ FDirName $(HAIKU_TOP) headers os app ] : true ;
# We need the public app headers also when not compiling for Haiku.
} }
UsePrivateHeaders media shared ; UsePrivateHeaders media shared ;
src/kits/media/MediaDefs.cpp
+3 -3
View File
@@ -6,9 +6,9 @@
#include <MediaDefs.h> #include <MediaDefs.h>
#include <MediaNode.h> #include <MediaNode.h>
#include <Roster.h> #include <Roster.h>
#include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdint.h>
#include "MediaMisc.h" #include "MediaMisc.h"
#include "debug.h" #include "debug.h"
@@ -725,7 +725,7 @@ media_format::operator=(const media_format &clone)
if (meta_data_area < 0) { if (meta_data_area < 0) {
// whoops, we just lost our meta data // whoops, we just lost our meta data
meta_data = NULL; meta_data = NULL;
meta_data_size = NULL; meta_data_size = 0;
} }
} else { } else {
meta_data = malloc(meta_data_size); meta_data = malloc(meta_data_size);
@@ -733,7 +733,7 @@ media_format::operator=(const media_format &clone)
memcpy(meta_data, clone.meta_data, meta_data_size); memcpy(meta_data, clone.meta_data, meta_data_size);
} else { } else {
// whoops, we just lost our meta data // whoops, we just lost our meta data
meta_data_size = NULL; meta_data_size = 0;
} }
} }
} }