From e29b8214bc48c27ced51d519fc581e219a602414 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Sun, 5 May 1996 04:40:15 +0000 Subject: [PATCH] include master config.h git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@497 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/telnet/acconfig.h | 25 ++----------------------- appl/telnet/config.h.in | 25 ++----------------------- 2 files changed, 4 insertions(+), 46 deletions(-) diff --git a/appl/telnet/acconfig.h b/appl/telnet/acconfig.h index bcbcf5ae6..4f5b36a2a 100644 --- a/appl/telnet/acconfig.h +++ b/appl/telnet/acconfig.h @@ -9,6 +9,8 @@ #ifndef T_CONFIG_H #define T_CONFIG_H +#include "../../config.h" + @TOP@ /* define this if you want authentication */ @@ -71,32 +73,9 @@ @BOTTOM@ -#ifdef __STDC__ -#define RCSID(msg) static const char *rcsid[] = { (char *)rcsid, "@(#)" msg } -#else -#define RCSID(msg) static char *rcsid[] = { (char *)rcsid, msg } -#endif - /* set this to a sensible login */ #ifndef LOGIN_PATH #define LOGIN_PATH "/usr/athena/bin/login" #endif - -/* this is left for hysteric reasons :-) */ -#ifdef _AIX -#define unix /* well, ok... */ -#endif - -/* - * SunOS braindamage! (Sun include files are generally braindead) - */ -#if (defined(sun) || defined(__sun)) -#if defined(__svr4__) || defined(__SVR4) -#define SunOS 5 -#else -#define SunOS 4 -#endif -#endif - #endif /* T_CONFIG_H */ diff --git a/appl/telnet/config.h.in b/appl/telnet/config.h.in index af29cea14..5ac02d1fb 100644 --- a/appl/telnet/config.h.in +++ b/appl/telnet/config.h.in @@ -10,6 +10,8 @@ #ifndef T_CONFIG_H #define T_CONFIG_H +#include "../../config.h" + /* Define as the return type of signal handlers (int or void). */ #undef RETSIGTYPE @@ -155,32 +157,9 @@ /* Define if you have the util library (-lutil). */ #undef HAVE_LIBUTIL -#ifdef __STDC__ -#define RCSID(msg) static const char *rcsid[] = { (char *)rcsid, "@(#)" msg } -#else -#define RCSID(msg) static char *rcsid[] = { (char *)rcsid, msg } -#endif - /* set this to a sensible login */ #ifndef LOGIN_PATH #define LOGIN_PATH "/usr/athena/bin/login" #endif - -/* this is left for hysteric reasons :-) */ -#ifdef _AIX -#define unix /* well, ok... */ -#endif - -/* - * SunOS braindamage! (Sun include files are generally braindead) - */ -#if (defined(sun) || defined(__sun)) -#if defined(__svr4__) || defined(__SVR4) -#define SunOS 5 -#else -#define SunOS 4 -#endif -#endif - #endif /* T_CONFIG_H */