Merge pull request #758 from xrmx/ptyfix

Fixup pty plugin compilation on hurd
This commit is contained in:
unbit
2014-10-27 12:11:21 +01:00
3 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ extern struct uwsgi_server uwsgi;
#elif defined(__FreeBSD__) || defined(__DragonFly__)
#include <libutil.h>
#endif
#if !defined(__FreeBSD__) || !defined(__DragonFly__)
#if !defined(__FreeBSD__) && !defined(__DragonFly__)
#include <utmp.h>
#endif
+3 -3
View File
@@ -1,12 +1,12 @@
#include <uwsgi.h>
#if defined(__linux__) || defined(__GNU_kFreeBSD__)
#if defined(__linux__) || defined(__GNU_kFreeBSD__) || defined(__HURD__)
#include <pty.h>
#elif defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__)
#include <util.h>
#elif defined(__FreeBSD__)
#elif defined(__FreeBSD__) || defined(__DragonFly__)
#include <libutil.h>
#endif
#ifndef __FreeBSD__
#if !defined(__FreeBSD__) && !defined(__DragonFly__)
#include <utmp.h>
#endif
+1 -1
View File
@@ -5,7 +5,7 @@ uwsgi_os = os.uname()[0]
CFLAGS = []
LDFLAGS = []
if uwsgi_os in ('Linux', 'FreeBSD'):
if uwsgi_os in ('Linux', 'FreeBSD', 'GNU', 'NetBSD', 'DragonFly'):
LIBS = ['-lutil']
else:
LIBS = []