diff options
| author | des <des@FreeBSD.org> | 2006-03-22 20:41:37 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-03-22 20:41:37 +0000 |
| commit | 7c07891caf91823c65d0ed7f700a1cfe983e15cc (patch) | |
| tree | fb276a713da5dc24fdafffe04d15c0de14e138e2 /crypto/openssh/includes.h | |
| parent | c2efe9a3053e865e5c7bf36de808ec154ddb8c36 (diff) | |
| download | FreeBSD-src-7c07891caf91823c65d0ed7f700a1cfe983e15cc.zip FreeBSD-src-7c07891caf91823c65d0ed7f700a1cfe983e15cc.tar.gz | |
Merge conflicts.
Diffstat (limited to 'crypto/openssh/includes.h')
| -rw-r--r-- | crypto/openssh/includes.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h index f4ab0a3..19aa1c4 100644 --- a/crypto/openssh/includes.h +++ b/crypto/openssh/includes.h @@ -1,4 +1,4 @@ -/* $OpenBSD: includes.h,v 1.19 2005/05/19 02:42:26 djm Exp $ */ +/* $OpenBSD: includes.h,v 1.22 2006/01/01 08:59:27 stevesk Exp $ */ /* $FreeBSD$ */ /* @@ -22,6 +22,8 @@ __RCSID(msg) #include "config.h" +#define _GNU_SOURCE /* activate extra prototypes for glibc */ + #include <stdarg.h> #include <stdio.h> #include <ctype.h> @@ -68,7 +70,6 @@ __RCSID(msg) #ifdef HAVE_NEXT # include <libc.h> #endif -#define __USE_GNU /* before unistd.h, activate extra prototypes for glibc */ #include <unistd.h> /* For STDIN_FILENO, etc */ #include <termios.h> /* Struct winsize */ |
