Ticket #1463: openbsd-fcollada.diff

File openbsd-fcollada.diff, 6.0 KB (added by Anthony J. Bentley, 12 years ago)

Patch that adds OpenBSD to #ifdefs.

  • libraries/fcollada/include/FCDocument/FCDocument.h 

    $OpenBSD$
    old new  
    3030#if defined(WIN32)
    3131template <class T> class FCOLLADA_EXPORT FCDLibrary; /**< Trick Doxygen. */
    3232template <class T> class FCOLLADA_EXPORT FUUniqueStringMapT; /**< Trick Doxygen. */
    33 #elif defined(LINUX) || defined(__APPLE__) || defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
     33#elif defined(LINUX) || defined(__APPLE__) || defined (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3434template <class T> class FCDLibrary; /**< Trick Doxygen. */
    3535template <class T> class FUUniqueStringMapT; /**< Trick Doxygen. */
    3636#endif // LINUX

  • libraries/fcollada/include/FUtils/FUCriticalSection.h 

    $OpenBSD$
    old new class FCOLLADA_EXPORT FUCriticalSection  
    3333(private)
    3434#elif defined (__APPLE__)
    3535    //Do something here.
    3636    MPCriticalRegionID criticalSection;
    37 #elif defined (LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     37#elif defined (LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3838#else
    3939#warning "FUCriticalSection: Critical section not implemented for other platforms."

  • libraries/fcollada/include/FUtils/Platforms.h 

     #endif
$OpenBSD$
    old new  
    7474#include <wchar.h>
    7575#include <stdint.h>
    7676#else // __APPLE__
    77 #if defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     77#if defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    7878#include <ctype.h>
    7979#include <wctype.h>
    8080#include <unistd.h>
    … …  
    8282#include <wchar.h>
    8383#include <stdarg.h>
    8484
    85 #ifndef __FreeBSD__
     85#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
    8686#include <malloc.h>
    87 #endif // __FreeBSD__
     87#endif // !__FreeBSD__ && !__OpenBSD__
    8888
    8989#include <stdlib.h>
    9090#include <stdio.h>
    … … typedef uint8_t byte;  
    127127#endif // PLATFORMS
    128128
    129129// Important functions that some OSes have missing!
    130 #if defined(__APPLE__) || defined (LINUX) || defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
     130#if defined(__APPLE__) || defined (LINUX) || defined (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    131131inline char* strlower(char* str) { char* it = str; while (*it != 0) { *it = tolower(*it); ++it; } return str; }
    132132inline wchar_t* wcslwr(wchar_t* str) { wchar_t* it = str; while (*it != 0) { *it = towlower(*it); ++it; } return str; }
    133133inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { wchar_t c1 = *s1, c2 = *s2; while (c1 != 0 && c2 != 0) { if (c1 >= 'a' && c1 <= 'z') c1 -= 'a' + 'A'; if (c2 >= 'a' && c2 <= 'z') c2 -= 'a' + 'A'; if (c2 < c1) return -1; else if (c2 > c1) return 1; c1 = *(++s1); c2 = *(++s2); } return 0; }

  • libraries/fcollada/src/FCollada/FCDocument/FCDocument.h 

    $OpenBSD$
    old new  
    3030#if defined(WIN32)
    3131template <class T> class FCOLLADA_EXPORT FCDLibrary; /**< Trick Doxygen. */
    3232template <class T> class FCOLLADA_EXPORT FUUniqueStringMapT; /**< Trick Doxygen. */
    33 #elif defined(LINUX) || defined(__APPLE__) || defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
     33#elif defined(LINUX) || defined(__APPLE__) || defined (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3434template <class T> class FCDLibrary; /**< Trick Doxygen. */
    3535template <class T> class FUUniqueStringMapT; /**< Trick Doxygen. */
    3636#endif // LINUX

  • libraries/fcollada/src/FCollada/FUtils/FUCriticalSection.h 

    $OpenBSD$
    old new class FCOLLADA_EXPORT FUCriticalSection  
    3333(private)
    3434#elif defined (__APPLE__)
    3535    //Do something here.
    3636    MPCriticalRegionID criticalSection;
    37 #elif defined (LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     37#elif defined (LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3838#else
    3939#warning "FUCriticalSection: Critical section not implemented for other platforms."

  • libraries/fcollada/src/FCollada/FUtils/Platforms.h 

     #endif
$OpenBSD$
    old new  
    7474#include <wchar.h>
    7575#include <stdint.h>
    7676#else // __APPLE__
    77 #if defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     77#if defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    7878#include <ctype.h>
    7979#include <wctype.h>
    8080#include <unistd.h>
    … …  
    8282#include <wchar.h>
    8383#include <stdarg.h>
    8484
    85 #ifndef __FreeBSD__
     85#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
    8686#include <malloc.h>
    87 #endif // __FreeBSD__
     87#endif // !__FreeBSD__ && !__OpenBSD__
    8888
    8989#include <stdlib.h>
    9090#include <stdio.h>
    … … typedef uint8_t byte;  
    127127#endif // PLATFORMS
    128128
    129129// Important functions that some OSes have missing!
    130 #if defined(__APPLE__) || defined (LINUX) || defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
     130#if defined(__APPLE__) || defined (LINUX) || defined (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    131131inline char* strlower(char* str) { char* it = str; while (*it != 0) { *it = tolower(*it); ++it; } return str; }
    132132inline wchar_t* wcslwr(wchar_t* str) { wchar_t* it = str; while (*it != 0) { *it = towlower(*it); ++it; } return str; }
    133133inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { wchar_t c1 = *s1, c2 = *s2; while (c1 != 0 && c2 != 0) { if (c1 >= 'a' && c1 <= 'z') c1 -= 'a' + 'A'; if (c2 >= 'a' && c2 <= 'z') c2 -= 'a' + 'A'; if (c2 < c1) return -1; else if (c2 > c1) return 1; c1 = *(++s1); c2 = *(++s2); } return 0; }