ShaYmez/P25Clients
1
0
Fork 0
mirror of https://github.com/ShaYmez/P25Clients.git synced 2024-11-21 19:55:22 -05:00
Code Issues Projects Releases Wiki Activity

Fix Windows compilation.

Browse Source
This commit is contained in:
Jonathan Naylor 2020-09-20 15:47:58 +01:00
parent a72977ec3d
commit f68d1adb1b
16 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
P25Gateway/P25Gateway.cpp
View File

@ -29,6 +29,7 @@
#include "Log.h" #include "Log.h"
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <WS2tcpip.h>
#include <Windows.h> #include <Windows.h>
#else #else
#include <sys/socket.h> #include <sys/socket.h>

2
P25Gateway/P25Gateway.h
View File

@ -35,7 +35,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#else #else
#include <winsock.h> #include <WS2tcpip.h>
#endif #endif
class CP25Gateway class CP25Gateway

1
P25Gateway/StopWatch.h
View File

@ -20,6 +20,7 @@
#define STOPWATCH_H #define STOPWATCH_H
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <WS2tcpip.h>
#include <windows.h> #include <windows.h>
#else #else
#include <sys/time.h> #include <sys/time.h>

1
P25Gateway/Thread.h
View File

@ -20,6 +20,7 @@
#define THREAD_H #define THREAD_H
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <WS2tcpip.h>
#include <windows.h> #include <windows.h>
#else #else
#include <pthread.h> #include <pthread.h>

1
P25Gateway/UDPSocket.h
View File

@ -32,7 +32,6 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#else #else
#include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif

2
P25Gateway/Version.h
View File

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20200906"; const char* VERSION = "20200920";
#endif #endif

1
P25Parrot/StopWatch.h
View File

@ -20,6 +20,7 @@
#define STOPWATCH_H #define STOPWATCH_H
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <WS2tcpip.h>
#include <windows.h> #include <windows.h>
#else #else
#include <sys/time.h> #include <sys/time.h>

1
P25Parrot/UDPSocket.h
View File

@ -32,7 +32,6 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#else #else
#include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif

2
P25Parrot/Version.h
View File

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20200906"; const char* VERSION = "20200920";
#endif #endif

1
P25Reflector/Mutex.h
View File

@ -20,6 +20,7 @@
#define MUTEX_H #define MUTEX_H
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <WS2tcpip.h>
#include <windows.h> #include <windows.h>
#else #else
#include <pthread.h> #include <pthread.h>

1
P25Reflector/P25Reflector.cpp
View File

@ -26,6 +26,7 @@
#include "Log.h" #include "Log.h"
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <WS2tcpip.h>
#include <Windows.h> #include <Windows.h>
#else #else
#include <sys/socket.h> #include <sys/socket.h>

2
P25Reflector/P25Reflector.h
View File

@ -35,7 +35,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#else #else
#include <winsock.h> #include <WS2tcpip.h>
#endif #endif
class CP25Repeater { class CP25Repeater {

1
P25Reflector/StopWatch.h
View File

@ -20,6 +20,7 @@
#define STOPWATCH_H #define STOPWATCH_H
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <WS2tcpip.h>
#include <windows.h> #include <windows.h>
#else #else
#include <sys/time.h> #include <sys/time.h>

1
P25Reflector/Thread.h
View File

@ -20,6 +20,7 @@
#define THREAD_H #define THREAD_H
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <WS2tcpip.h>
#include <windows.h> #include <windows.h>
#else #else
#include <pthread.h> #include <pthread.h>

1
P25Reflector/UDPSocket.h
View File

@ -32,7 +32,6 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#else #else
#include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif

2
P25Reflector/Version.h
View File

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20200908"; const char* VERSION = "20200920";
#endif #endif