AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix compilation on OpenBSD

Browse source
This commit is contained in:
Jon Williams 2016-03-31 13:25:32 -04:00
parent dfc253bebf
commit 94706763e5
5 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -31,6 +31,10 @@ CFLAGS+=-std=c11
COMPAT+=compat/clock_gettime/clock_gettime.o compat/clock_nanosleep/clock_nanosleep.o COMPAT+=compat/clock_gettime/clock_gettime.o compat/clock_nanosleep/clock_nanosleep.o
endif endif
ifeq ($(UNAME), OpenBSD)
COMPAT+= compat/clock_nanosleep/clock_nanosleep.o
endif
all: dump1090 view1090 all: dump1090 view1090
%.o: %.c *.h %.o: %.c *.h

5
compat/clock_nanosleep/clock_nanosleep.c
View file

@ -19,10 +19,13 @@
* http://www.gnu.org/copyleft/gpl.html * * http://www.gnu.org/copyleft/gpl.html *
***********************************************************************/ ***********************************************************************/
#include "clock_nanosleep.h"
#include <errno.h> // for errno, EINVAL #include <errno.h> // for errno, EINVAL
#include <time.h> // for nanosleep, NULL #include <time.h> // for nanosleep, NULL
#include "clock_nanosleep.h"
#ifdef MISSING_GETTIME
#include "../clock_gettime/clock_gettime.h" // for clock_gettime #include "../clock_gettime/clock_gettime.h" // for clock_gettime
#endif
int clock_nanosleep(clockid_t id, int flags, const struct timespec *ts, int clock_nanosleep(clockid_t id, int flags, const struct timespec *ts,
struct timespec *ots) { struct timespec *ots) {

6
compat/clock_nanosleep/clock_nanosleep.h
View file

@ -1,8 +1,8 @@
#ifndef CLOCK_NANOSLEEP_H #ifndef CLOCK_NANOSLEEP_H
#define CLOCK_NANOSLEEP_H #define CLOCK_NANOSLEEP_H
#ifndef CLOCKID_T #ifndef _CLOCK_T_DEFINED_
#define CLOCKID_T #define _CLOCK_T_DEFINED_
typedef enum typedef enum
{ {
CLOCK_REALTIME, CLOCK_REALTIME,
@ -10,7 +10,7 @@ typedef enum
CLOCK_PROCESS_CPUTIME_ID, CLOCK_PROCESS_CPUTIME_ID,
CLOCK_THREAD_CPUTIME_ID CLOCK_THREAD_CPUTIME_ID
} clockid_t; } clockid_t;
#endif // CLOCKID_T #endif // _CLOCK_T_DEFINED_
#ifndef TIMER_ABSTIME #ifndef TIMER_ABSTIME
#define TIMER_ABSTIME 1 #define TIMER_ABSTIME 1

16
compat/compat.h
View file

@ -9,8 +9,8 @@
/* implementations of clock_gettime, clock_nanosleep */ /* implementations of clock_gettime, clock_nanosleep */
#include "clock_gettime/clock_gettime.h" #define MISSING_NANOSLEEP
#include "clock_nanosleep/clock_nanosleep.h" #define MISSING_GETTIME
/* /*
* Mach endian conversion * Mach endian conversion
@ -29,4 +29,16 @@
#endif #endif
#if defined(__OpenBSD__)
#define MISSING_NANOSLEEP
#endif
#ifdef MISSING_NANOSLEEP
#include "clock_nanosleep/clock_nanosleep.h"
#endif
#ifdef MISSING_GETTIME
#include "clock_nanosleep/clock_gettime.h"
#endif
#endif //COMPAT_UTIL_H #endif //COMPAT_UTIL_H

2
net_io.c
View file

@ -1316,7 +1316,7 @@ static int handleHTTPRequest(struct client *c, char *p) {
const char *statusmsg = "Internal Server Error"; const char *statusmsg = "Internal Server Error";
char *url, *content = NULL; char *url, *content = NULL;
char *ext; char *ext;
char *content_type; char *content_type = NULL;
int i; int i;
if (Modes.debug & MODES_DEBUG_NET) if (Modes.debug & MODES_DEBUG_NET)