Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/dist/heimdal/lib/roken Backout previous which breaks ...
details: https://anonhg.NetBSD.org/src/rev/c90a8b84ed68
branches: trunk
changeset: 750981:c90a8b84ed68
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Wed Jan 20 15:03:50 2010 +0000
description:
Backout previous which breaks build on NetBSD. Pointed out by wiz@.
Probably we have to add a check for HAVE_STRUCT_WINSIZE
in src/tools/configure as src/crypto/dist/heimdal/configure does.
diffstat:
crypto/dist/heimdal/lib/roken/get_window_size.c | 6 +-----
crypto/dist/heimdal/lib/roken/getarg.c | 10 +---------
2 files changed, 2 insertions(+), 14 deletions(-)
diffs (50 lines):
diff -r 8d7fcac92bb5 -r c90a8b84ed68 crypto/dist/heimdal/lib/roken/get_window_size.c
--- a/crypto/dist/heimdal/lib/roken/get_window_size.c Wed Jan 20 14:00:48 2010 +0000
+++ b/crypto/dist/heimdal/lib/roken/get_window_size.c Wed Jan 20 15:03:50 2010 +0000
@@ -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)
diff -r 8d7fcac92bb5 -r c90a8b84ed68 crypto/dist/heimdal/lib/roken/getarg.c
--- a/crypto/dist/heimdal/lib/roken/getarg.c Wed Jan 20 14:00:48 2010 +0000
+++ b/crypto/dist/heimdal/lib/roken/getarg.c Wed Jan 20 15:03:50 2010 +0000
@@ -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)
Home |
Main Index |
Thread Index |
Old Index