Module Name: src
Committed By: tsutsui
Date: Wed Jan 20 15:03:51 UTC 2010
Modified Files:
src/crypto/dist/heimdal/lib/roken: get_window_size.c getarg.c
Log Message:
Backout previous which breaks build on NetBSD. Pointed out by w...@.
Probably we have to add a check for HAVE_STRUCT_WINSIZE
in src/tools/configure as src/crypto/dist/heimdal/configure does.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/dist/heimdal/lib/roken/get_window_size.c \
src/crypto/dist/heimdal/lib/roken/getarg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/heimdal/lib/roken/get_window_size.c
diff -u src/crypto/dist/heimdal/lib/roken/get_window_size.c:1.4 src/crypto/dist/heimdal/lib/roken/get_window_size.c:1.5
--- src/crypto/dist/heimdal/lib/roken/get_window_size.c:1.4 Wed Jan 20 12:54:17 2010
+++ src/crypto/dist/heimdal/lib/roken/get_window_size.c Wed Jan 20 15:03:50 2010
@@ -34,7 +34,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
__RCSID("$Heimdal: get_window_size.c 21005 2007-06-08 01:54:35Z lha $"
- "$NetBSD: get_window_size.c,v 1.4 2010/01/20 12:54:17 tsutsui Exp $");
+ "$NetBSD: get_window_size.c,v 1.5 2010/01/20 15:03:50 tsutsui Exp $");
#endif
#include <stdlib.h>
@@ -59,11 +59,7 @@
#include <termios.h>
#endif
-#ifdef HAVE_NBTOOL_CONFIG_H
-#include "roken-common.h"
-#else
#include "roken.h"
-#endif
int ROKEN_LIB_FUNCTION
get_window_size(int fd, struct winsize *wp)
Index: src/crypto/dist/heimdal/lib/roken/getarg.c
diff -u src/crypto/dist/heimdal/lib/roken/getarg.c:1.4 src/crypto/dist/heimdal/lib/roken/getarg.c:1.5
--- src/crypto/dist/heimdal/lib/roken/getarg.c:1.4 Wed Jan 20 12:54:17 2010
+++ src/crypto/dist/heimdal/lib/roken/getarg.c Wed Jan 20 15:03:50 2010
@@ -34,21 +34,13 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
__RCSID("$Heimdal: getarg.c 21005 2007-06-08 01:54:35Z lha $"
- "$NetBSD: getarg.c,v 1.4 2010/01/20 12:54:17 tsutsui Exp $");
+ "$NetBSD: getarg.c,v 1.5 2010/01/20 15:03:50 tsutsui Exp $");
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#ifdef HAVE_TERMIOS_H /* XXX for struct winsize */
-#include <termios.h>
-#endif
-#include "roken-common.h"
-#else
#include "roken.h"
-#endif
#include "getarg.h"
#define ISFLAG(X) ((X).type == arg_flag || (X).type == arg_negative_flag)
