1
0
Fork 0

Merge branch 'IPv6' into DG-ID

ycs232-kbc
Jonathan Naylor 4 years ago
commit f0b9aeea73

@ -37,7 +37,7 @@
#include <gps.h> #include <gps.h>
#endif #endif
#else #else
#include <winsock.h> #include <ws2tcpip.h>
#endif #endif
class CAPRSWriter { class CAPRSWriter {

@ -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

@ -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

@ -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>

@ -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

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

@ -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>

@ -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

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

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2016 by Jonathan Naylor G4KLX * Copyright (C) 2016,2020 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -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 CYSFRepeater { class CYSFRepeater {

Loading…
Cancel
Save