differentiate between THREADX and RTP_SYS

This commit is contained in:
toddouska
2013-06-14 13:45:25 -07:00
parent 9559f09028
commit 7f7c595d10
5 changed files with 13 additions and 13 deletions

View File

@@ -27,7 +27,7 @@
#ifndef NO_ASN #ifndef NO_ASN
#ifdef THREADX #ifdef HAVE_RTP_SYS
#include "os.h" /* dc_rtc_api needs */ #include "os.h" /* dc_rtc_api needs */
#include "dc_rtc_api.h" /* to get current time */ #include "dc_rtc_api.h" /* to get current time */
#endif #endif
@@ -82,7 +82,7 @@
#endif #endif
#ifdef THREADX #ifdef HAVE_RTP_SYS
/* uses parital <time.h> structures */ /* uses parital <time.h> structures */
#define XTIME(tl) (0) #define XTIME(tl) (0)
#define XGMTIME(c) my_gmtime((c)) #define XGMTIME(c) my_gmtime((c))
@@ -237,7 +237,7 @@ struct tm* gmtime(const time_t* timer)
#endif /* _WIN32_WCE || USER_TIME */ #endif /* _WIN32_WCE || USER_TIME */
#ifdef THREADX #ifdef HAVE_RTP_SYS
#define YEAR0 1900 #define YEAR0 1900
@@ -259,7 +259,7 @@ struct tm* my_gmtime(const time_t* timer) /* has a gmtime() but hangs */
return ret; return ret;
} }
#endif /* THREADX */ #endif /* HAVE_RTP_SYS */
#if defined(MICROCHIP_TCPIP_V5) || defined(MICROCHIP_TCPIP) #if defined(MICROCHIP_TCPIP_V5) || defined(MICROCHIP_TCPIP)

View File

@@ -413,7 +413,7 @@ int GenerateSeed(OS_Seed* os, byte* output, word32 sz)
} }
#elif defined(THREADX) || defined(EBSNET) #elif defined(HAVE_RTP_SYS) || defined(EBSNET)
#include "rtprand.h" /* rtp_rand () */ #include "rtprand.h" /* rtp_rand () */
#include "rtptime.h" /* rtp_get_system_msec() */ #include "rtptime.h" /* rtp_get_system_msec() */
@@ -593,7 +593,7 @@ int GenerateSeed(OS_Seed* os, byte* output, word32 sz)
*/ */
#else /* !USE_WINDOWS_API && !THREADX && !MICRIUM && !NO_DEV_RANDOM */ #else /* !USE_WINDOWS_API && !HAVE_RPT_SYS && !MICRIUM && !NO_DEV_RANDOM */
/* may block */ /* may block */

View File

@@ -111,10 +111,10 @@ enum {
#define INLINE __inline #define INLINE __inline
#elif defined(__GNUC__) #elif defined(__GNUC__)
#define INLINE inline #define INLINE inline
#elif defined(THREADX)
#define INLINE _Inline
#elif defined(__IAR_SYSTEMS_ICC__) #elif defined(__IAR_SYSTEMS_ICC__)
#define INLINE inline #define INLINE inline
#elif defined(THREADX)
#define INLINE _Inline
#else #else
#define INLINE #define INLINE
#endif #endif

View File

@@ -2094,7 +2094,7 @@ ProtocolVersion MakeDTLSv1_2(void)
return (word32)(count.QuadPart / freq.QuadPart); return (word32)(count.QuadPart / freq.QuadPart);
} }
#elif defined(THREADX) #elif defined(HAVE_RTP_SYS)
#include "rtptime.h" #include "rtptime.h"
@@ -2143,7 +2143,7 @@ ProtocolVersion MakeDTLSv1_2(void)
*/ */
} }
#endif #endif
#else /* !USE_WINDOWS_API && !THREADX && !MICRIUM && !USER_TICKS */ #else /* !USE_WINDOWS_API && !HAVE_RTP_SYS && !MICRIUM && !USER_TICKS */
#include <time.h> #include <time.h>

View File

@@ -70,7 +70,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#if !(defined(DEVKITPRO) || defined(THREADX) || defined(EBSNET)) #if !(defined(DEVKITPRO) || defined(HAVE_RTP_SYS) || defined(EBSNET))
#include <sys/socket.h> #include <sys/socket.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>
@@ -81,7 +81,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#endif #endif
#ifdef THREADX #ifdef HAVE_RTP_SYS
#include <socket.h> #include <socket.h>
#endif #endif
#ifdef EBSNET #ifdef EBSNET