Assembla home | Assembla project page
 

root/BePorts/trunk/media-libs/libogg/libogg-1.1.3-haiku.diff

Revision 77, 2.3 kB (checked in by scottmc, 4 months ago)

Updated diff file to remove config.guess, config.sub, and change
os_types.h to put Haiku section ahead of BeOS in the '#elif' chain.

  • libogg-1.1.3/configure.in

    old new  
    8484AC_MSG_CHECKING(for int16_t) 
    8585AC_CACHE_VAL(has_int16_t, 
    8686[AC_TRY_RUN([ 
    87 #ifdef __BEOS__ 
     87#if defined __BEOS__ && !defined __HAIKU__ 
    8888#include <inttypes.h> 
    8989#endif 
    9090#include <sys/types.h> 
    …… 
    100100AC_MSG_CHECKING(for int32_t) 
    101101AC_CACHE_VAL(has_int32_t, 
    102102[AC_TRY_RUN([ 
    103 #ifdef __BEOS__ 
     103#if defined __BEOS__ && !defined __HAIKU__ 
    104104#include <inttypes.h> 
    105105#endif 
    106106#include <sys/types.h> 
    …… 
    116116AC_MSG_CHECKING(for uint32_t) 
    117117AC_CACHE_VAL(has_uint32_t, 
    118118[AC_TRY_RUN([ 
    119 #ifdef __BEOS__ 
     119#if defined __BEOS__ && !defined __HAIKU__ 
    120120#include <inttypes.h> 
    121121#endif 
    122122#include <sys/types.h> 
    …… 
    132132AC_MSG_CHECKING(for uint16_t) 
    133133AC_CACHE_VAL(has_uint16_t, 
    134134[AC_TRY_RUN([ 
    135 #ifdef __BEOS__ 
     135#if defined __BEOS__ && !defined __HAIKU__ 
    136136#include <inttypes.h> 
    137137#endif 
    138138#include <sys/types.h> 
    …… 
    148148AC_MSG_CHECKING(for u_int32_t) 
    149149AC_CACHE_VAL(has_u_int32_t, 
    150150[AC_TRY_RUN([ 
    151 #ifdef __BEOS__ 
     151#if defined __BEOS__ && !defined __HAIKU__ 
    152152#include <inttypes.h> 
    153153#endif 
    154154#include <sys/types.h> 
    …… 
    164164AC_MSG_CHECKING(for u_int16_t) 
    165165AC_CACHE_VAL(has_u_int16_t, 
    166166[AC_TRY_RUN([ 
    167 #ifdef __BEOS__ 
     167#if defined __BEOS__ && !defined __HAIKU__ 
    168168#include <inttypes.h> 
    169169#endif 
    170170#include <sys/types.h> 
    …… 
    180180AC_MSG_CHECKING(for int64_t) 
    181181AC_CACHE_VAL(has_int64_t, 
    182182[AC_TRY_RUN([ 
    183 #ifdef __BEOS__ 
     183#if defined __BEOS__ && !defined __HAIKU__ 
    184184#include <inttypes.h> 
    185185#endif 
    186186#include <sys/types.h> 

  • libogg-1.1.3/include/ogg/os_types.h

    old new  
    7373   typedef u_int32_t ogg_uint32_t; 
    7474   typedef int64_t ogg_int64_t; 
    7575 
    76 #elif defined(__BEOS__) 
     76#elif defined(__HAIKU__) 
     77 
     78  /* Haiku */ 
     79#  include <sys/types.h> 
     80   typedef short ogg_int16_t; 
     81   typedef unsigned short ogg_uint16_t; 
     82   typedef int ogg_int32_t; 
     83   typedef unsigned int ogg_uint32_t; 
     84   typedef long long ogg_int64_t;    
     85 
     86#elif defined(__BEOS__)  
    7787 
    7888   /* Be */ 
    7989#  include <inttypes.h> 
Note: See TracBrowser for help on using the browser.