joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix type mismatch

Browse Source
This commit is contained in:
maron2000
2025-05-10 13:23:03 +09:00
parent 5a70f869ad
commit eae5f261f5
4 changed files with 122 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/enet.h
View File

@@ -5125,11 +5125,53 @@ extern "C" {
} }
#endif #endif
#elif __APPLE__ && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200 #elif __APPLE__ && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
#define CLOCK_REALTIME 0 #include <Availability.h>
#define CLOCK_MONOTONIC 1 #define STR2(x) #x
#define STR(x) STR2(x)
#pragma message("__MAC_OS_X_VERSION_MIN_REQUIRED = " STR(__MAC_OS_X_VERSION_MIN_REQUIRED))
typedef enum {
_CLOCK_REALTIME = 0,
#if !defined(CLOCK_REALTIME)
#define CLOCK_REALTIME _CLOCK_REALTIME
#endif
_CLOCK_MONOTONIC = 6,
#if !defined(CLOCK_MONOTONIC)
#define CLOCK_MONOTONIC _CLOCK_MONOTONIC
#endif
#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
_CLOCK_MONOTONIC_RAW = 4,
#if !defined(CLOCK_MONOTONIC_RAW)
#define CLOCK_MONOTONIC_RAW _CLOCK_MONOTONIC_RAW
#endif
_CLOCK_MONOTONIC_RAW_APPROX = 5,
#if !defined(CLOCK_MONOTONIC_RAW_APPROX)
#define CLOCK_MONOTONIC_RAW_APPROX _CLOCK_MONOTONIC_RAW_APPROX
#endif
_CLOCK_UPTIME_RAW = 8,
#if !defined(CLOCK_UPTIME_RAW)
#define CLOCK_UPTIME_RAW _CLOCK_UPTIME_RAW
#endif
_CLOCK_UPTIME_RAW_APPROX = 9,
#if !defined(CLOCK_UPTIME_RAW_APPROX)
#define CLOCK_UPTIME_RAW_APPROX _CLOCK_UPTIME_RAW_APPROX
#endif
#endif
_CLOCK_PROCESS_CPUTIME_ID = 12,
#if !defined(CLOCK_PROCESS_CPUTIME_ID)
#define CLOCK_PROCESS_CPUTIME_ID _CLOCK_PROCESS_CPUTIME_ID
#endif
_CLOCK_THREAD_CPUTIME_ID = 16
#if !defined(CLOCK_THREAD_CPUTIME_ID)
#define CLOCK_THREAD_CPUTIME_ID _CLOCK_THREAD_CPUTIME_ID
#endif
} clockid_t;
extern "C" { extern "C" {
int clock_gettime(int X, struct timespec *tv); /* clock_gettime() only available in macOS 10.12+ (Sierra) */
int clock_gettime(clockid_t clk_id, struct timespec *tp);
} }
#if 0 #if 0
#define CLOCK_MONOTONIC 0 #define CLOCK_MONOTONIC 0

40
src/dos/dos_files.cpp
View File

@@ -60,11 +60,45 @@ extern "C" {
#include <mach/mach_time.h> #include <mach/mach_time.h>
#include <sys/time.h> #include <sys/time.h>
#define CLOCK_REALTIME 0 typedef enum {
#define CLOCK_MONOTONIC 1 _CLOCK_REALTIME = 0,
#if !defined(CLOCK_REALTIME)
#define CLOCK_REALTIME _CLOCK_REALTIME
#endif
_CLOCK_MONOTONIC = 6,
#if !defined(CLOCK_MONOTONIC)
#define CLOCK_MONOTONIC _CLOCK_MONOTONIC
#endif
#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
_CLOCK_MONOTONIC_RAW = 4,
#if !defined(CLOCK_MONOTONIC_RAW)
#define CLOCK_MONOTONIC_RAW _CLOCK_MONOTONIC_RAW
#endif
_CLOCK_MONOTONIC_RAW_APPROX = 5,
#if !defined(CLOCK_MONOTONIC_RAW_APPROX)
#define CLOCK_MONOTONIC_RAW_APPROX _CLOCK_MONOTONIC_RAW_APPROX
#endif
_CLOCK_UPTIME_RAW = 8,
#if !defined(CLOCK_UPTIME_RAW)
#define CLOCK_UPTIME_RAW _CLOCK_UPTIME_RAW
#endif
_CLOCK_UPTIME_RAW_APPROX = 9,
#if !defined(CLOCK_UPTIME_RAW_APPROX)
#define CLOCK_UPTIME_RAW_APPROX _CLOCK_UPTIME_RAW_APPROX
#endif
#endif
_CLOCK_PROCESS_CPUTIME_ID = 12,
#if !defined(CLOCK_PROCESS_CPUTIME_ID)
#define CLOCK_PROCESS_CPUTIME_ID _CLOCK_PROCESS_CPUTIME_ID
#endif
_CLOCK_THREAD_CPUTIME_ID = 16
#if !defined(CLOCK_THREAD_CPUTIME_ID)
#define CLOCK_THREAD_CPUTIME_ID _CLOCK_THREAD_CPUTIME_ID
#endif
} clockid_t;
/* clock_gettime() only available in macOS 10.12+ (Sierra) */ /* clock_gettime() only available in macOS 10.12+ (Sierra) */
int clock_gettime(int clk_id, struct timespec *tp) { int clock_gettime(clockid_t clk_id, struct timespec *tp) {
if (clk_id == CLOCK_REALTIME) { if (clk_id == CLOCK_REALTIME) {
struct timeval now; struct timeval now;
gettimeofday(&now, NULL); gettimeofday(&now, NULL);

14
src/hardware/serialport/misc_util.cpp
View File

@@ -33,20 +33,6 @@
#undef WITH_ENET_IMPLEMENTATION #undef WITH_ENET_IMPLEMENTATION
#endif #endif
#if __APPLE__ && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
#include <Availability.h>
#define STR2(x) #x
#define STR(x) STR2(x)
#pragma message("__MAC_OS_X_VERSION_MIN_REQUIRED = " STR(__MAC_OS_X_VERSION_MIN_REQUIRED))
#define CLOCK_REALTIME 0
#define CLOCK_MONOTONIC 1
extern "C" {
int clock_gettime(int X, struct timespec *tv); /* macOS 10.12+ has clock_gettime() */
}
#endif
#if defined(WITH_ENET_IMPLEMENTATION) #if defined(WITH_ENET_IMPLEMENTATION)
#define ENET_IMPLEMENTATION #define ENET_IMPLEMENTATION
#include "enet.h" #include "enet.h"

44
src/misc/ethernet_slirp.cpp
View File

@@ -31,10 +31,46 @@
extern std::string niclist; extern std::string niclist;
#if __APPLE__ && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200 #if __APPLE__ && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
#define CLOCK_REALTIME 0 typedef enum {
#define CLOCK_MONOTONIC 1 _CLOCK_REALTIME = 0,
extern "C"{ #if !defined(CLOCK_REALTIME)
int clock_gettime(int X, struct timespec *ts); /* macOS 10.12+ has clock_gettime() */ #define CLOCK_REALTIME _CLOCK_REALTIME
#endif
_CLOCK_MONOTONIC = 6,
#if !defined(CLOCK_MONOTONIC)
#define CLOCK_MONOTONIC _CLOCK_MONOTONIC
#endif
#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
_CLOCK_MONOTONIC_RAW = 4,
#if !defined(CLOCK_MONOTONIC_RAW)
#define CLOCK_MONOTONIC_RAW _CLOCK_MONOTONIC_RAW
#endif
_CLOCK_MONOTONIC_RAW_APPROX = 5,
#if !defined(CLOCK_MONOTONIC_RAW_APPROX)
#define CLOCK_MONOTONIC_RAW_APPROX _CLOCK_MONOTONIC_RAW_APPROX
#endif
_CLOCK_UPTIME_RAW = 8,
#if !defined(CLOCK_UPTIME_RAW)
#define CLOCK_UPTIME_RAW _CLOCK_UPTIME_RAW
#endif
_CLOCK_UPTIME_RAW_APPROX = 9,
#if !defined(CLOCK_UPTIME_RAW_APPROX)
#define CLOCK_UPTIME_RAW_APPROX _CLOCK_UPTIME_RAW_APPROX
#endif
#endif
_CLOCK_PROCESS_CPUTIME_ID = 12,
#if !defined(CLOCK_PROCESS_CPUTIME_ID)
#define CLOCK_PROCESS_CPUTIME_ID _CLOCK_PROCESS_CPUTIME_ID
#endif
_CLOCK_THREAD_CPUTIME_ID = 16
#if !defined(CLOCK_THREAD_CPUTIME_ID)
#define CLOCK_THREAD_CPUTIME_ID _CLOCK_THREAD_CPUTIME_ID
#endif
} clockid_t;
extern "C" {
/* clock_gettime() only available in macOS 10.12+ (Sierra) */
int clock_gettime(clockid_t clk_id, struct timespec *tp);
} }
#endif #endif