summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Naumov <alexander_naumov@opensuse.org>2016-12-06 16:05:57 +0100
committerAlexander Naumov <alexander_naumov@opensuse.org>2016-12-06 16:05:57 +0100
commitb50e50c454d7921a0e369e122d4e2be9fbe7856f (patch)
treece117fc6e6acd5717d127b504e52f369efcc6f47
parentb0765867b3f8fded5034f31c3470d87d6a45ab96 (diff)
downloadscreen-b50e50c454d7921a0e369e122d4e2be9fbe7856f.tar.gz
Build bugfix for AIX
bug #49149 Thanks to Tony Reix
-rw-r--r--src/Makefile.in2
-rw-r--r--src/osdef.h.in4
-rw-r--r--src/screen.c3
3 files changed, 8 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index f6e8d2f..eff975e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -22,7 +22,7 @@ bindir = $(exec_prefix)/bin
VERSION = @VERSION@
SCREEN = screen-$(VERSION)
-GIT_REV = "`git describe --always 2>/dev/null`"
+GIT_REV =
DEFS = @DEFS@ -DGIT_REV=\"$(GIT_REV)\"
ETCSCREENRC = @ETCSCREENRC@
diff --git a/src/osdef.h.in b/src/osdef.h.in
index 8687b60..3627154 100644
--- a/src/osdef.h.in
+++ b/src/osdef.h.in
@@ -155,8 +155,12 @@ extern int socket __P((int, int, int));
extern int connect __P((int, struct sockaddr *, int));
extern int bind __P((int, struct sockaddr *, int));
extern int listen __P((int, int));
+#ifdef _AIX
+extern int accept __P((int, struct sockaddr *, socklen_t *));
+#else
extern int accept __P((int, struct sockaddr *, int *));
#endif
+#endif
#if defined(UTMPOK) && defined(GETUTENT)
extern void setutent __P((void));
diff --git a/src/screen.c b/src/screen.c
index 3e435ae..64650e9 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -39,6 +39,9 @@
*/
#include <sys/types.h>
+#ifdef _AIX
+#include <sys/socket.h>
+#endif
#include <ctype.h>
#include <fcntl.h>