diff options
author | Ralph Giles <giles@xiph.org> | 2001-11-02 07:39:13 +0000 |
---|---|---|
committer | Ralph Giles <giles@xiph.org> | 2001-11-02 07:39:13 +0000 |
commit | c61e6b99fa9ce1bc6dda64b3e1d21644ba8bd6cc (patch) | |
tree | 148a606e1e827f420354c700aceb140549426d48 /include | |
parent | 8b19de92c109e7688547c149ed57a7ec736e950c (diff) | |
download | ogg-c61e6b99fa9ce1bc6dda64b3e1d21644ba8bd6cc.tar.gz |
Add build-specific defines to os_types.h for the ProjectBuilder stuff. As
near as I can tell ProjectBuilder doesn't actually define __MACOS__ or
__COCOA__ or __PROJECTBUILDER__ or any other obvious thing. This config
actually passes -D__MACOSX__ on the gcc cmd line and switches off that.
The ogg framework should now build 'out of the box'.
git-svn-id: http://svn.xiph.org/trunk/ogg@2290 0101bb08-14d6-0310-b084-bc0e0c8e3800
Diffstat (limited to 'include')
-rw-r--r-- | include/ogg/os_types.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/ogg/os_types.h b/include/ogg/os_types.h index cbc0cd8..6b63c2f 100644 --- a/include/ogg/os_types.h +++ b/include/ogg/os_types.h @@ -11,7 +11,7 @@ ******************************************************************** function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id: os_types.h,v 1.7 2001/06/03 03:09:18 xiphmont Exp $ + last mod: $Id: os_types.h,v 1.8 2001/11/02 07:39:12 giles Exp $ ********************************************************************/ #ifndef _OS_TYPES_H @@ -41,7 +41,7 @@ typedef _G_int16_t ogg_int16_t; # endif -#elif defined(macintosh) +#elif defined(__MACOS__) # include <sys/types.h> typedef SInt16 ogg_int16_t; @@ -49,6 +49,14 @@ typedef UInt32 ogg_uint32_t; typedef SInt64 ogg_int64_t; +#elif defined(__MACOSX__) /* MacOS X Framework build */ + +# include <sys/types.h> + typedef int16_t ogg_int16_t; + typedef int32_t ogg_int32_t; + typedef u_int32_t ogg_uint32_t; + typedef int64_t ogg_int64_t; + #elif defined(__BEOS__) /* Be */ |