bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned defines

Browse Source
This commit is contained in:
Michiel Broek 2003-05-10 14:14:16 +00:00
parent 5999ae379f
commit 296e170bbd
6 changed files with 22 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
config.h.in
View File

@ -17,9 +17,6 @@
/* Has strcasestr function */ /* Has strcasestr function */
#undef HAVE_STRCASESTR #undef HAVE_STRCASESTR
/* Has mkstemp function */
#undef HAVE_MKSTEMP
/* If you have gettimeofday function */ /* If you have gettimeofday function */
#undef HAVE_DECLARED_TIMEZONE #undef HAVE_DECLARED_TIMEZONE
#undef HAVE_TM_GMTOFF #undef HAVE_TM_GMTOFF
@ -27,9 +24,6 @@
/* If you don't have pid_t */ /* If you don't have pid_t */
#undef DONT_HAVE_PID_T #undef DONT_HAVE_PID_T
/* Believe ZFIN */
#undef BELEIVE_ZFIN
/* NOPROTO in lhash.h ??? */ /* NOPROTO in lhash.h ??? */
#undef NOPROTO #undef NOPROTO
@ -40,18 +34,8 @@
#undef RESTAMP_FUTURE_POSTINGS #undef RESTAMP_FUTURE_POSTINGS
#undef RESTAMP_OLD_POSTINGS #undef RESTAMP_OLD_POSTINGS
/* From mbftpd: */ /* From unix: */
#undef FNM_PATHNAME
#undef IP_TOS
#undef M_UNIX
#undef NBBY
#undef REGEX
#undef REGEXEC
#undef SHADOW_PASSWORD #undef SHADOW_PASSWORD
#undef HAVE_SHADOWGRP
#undef SO_OOBINLINE
/* mbuseradd */
#undef AGING #undef AGING
#undef ATT_AGE #undef ATT_AGE
#undef ATT_COMMENT #undef ATT_COMMENT
@ -80,9 +64,6 @@
/* Defined if it includes *Pw functions. */ /* Defined if it includes *Pw functions. */
#undef HAVE_LIBCRACK_PW #undef HAVE_LIBCRACK_PW
/* Defined if you have libcrypt. */
#undef HAVE_LIBCRYPT
#undef KEEP_NIS_AT_END #undef KEEP_NIS_AT_END
/* Define to support the MD5-based password hashing algorithm. */ /* Define to support the MD5-based password hashing algorithm. */
@ -96,12 +77,6 @@
/* Define to 1 if NLS is requested. */ /* Define to 1 if NLS is requested. */
#undef ENABLE_NLS #undef ENABLE_NLS
/* Define to libshadow_getpass to use our own version of getpass(). */
#undef getpass
/* Define if your locale.h file contains LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
/* Path for lastlog file. */ /* Path for lastlog file. */
#undef LASTLOG_FILE #undef LASTLOG_FILE
@ -120,12 +95,6 @@
/* Define if you have the updwtmpx function. */ /* Define if you have the updwtmpx function. */
#undef HAVE_UPDWTMPX #undef HAVE_UPDWTMPX
/* Define if mblogin should support the -r flag for rlogind. */
#undef RLOGIN
/* Define if you have the getutent function. */
#undef HAVE_GETUTENT
/* Define if you have the <lastlog.h> header file. */ /* Define if you have the <lastlog.h> header file. */
#undef HAVE_LASTLOG_H #undef HAVE_LASTLOG_H
@ -150,18 +119,12 @@
/* Define if you have the <dirent.h> header file, and it defines `DIR'. */ /* Define if you have the <dirent.h> header file, and it defines `DIR'. */
#undef HAVE_DIRENT_H #undef HAVE_DIRENT_H
/* Define if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
/* Define if you have the `fchmod' function. */ /* Define if you have the `fchmod' function. */
#undef HAVE_FCHMOD #undef HAVE_FCHMOD
/* Define if you have the `fchown' function. */ /* Define if you have the `fchown' function. */
#undef HAVE_FCHOWN #undef HAVE_FCHOWN
/* Define if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define if you have the `fdatasync' function. */ /* Define if you have the `fdatasync' function. */
#undef HAVE_FDATASYNC #undef HAVE_FDATASYNC
@ -171,12 +134,6 @@
/* Define if you have the `fsync' function. */ /* Define if you have the `fsync' function. */
#undef HAVE_FSYNC #undef HAVE_FSYNC
/* Define if you have the `getcwd' function. */
#undef HAVE_GETCWD
/* Define if you have the `gethostname' function. */
#undef HAVE_GETHOSTNAME
/* Define if you have the `gettimeofday' function. */ /* Define if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY #undef HAVE_GETTIMEOFDAY
@ -198,24 +155,9 @@
/* Define if you have the <memory.h> header file. */ /* Define if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H #undef HAVE_MEMORY_H
/* Define if you have the `mkdir' function. */
#undef HAVE_MKDIR
/* Define if you have the `mkstemp' function. */
#undef HAVE_MKSTEMP
/* Define if you have the `mktime' function. */
#undef HAVE_MKTIME
/* Define if you have the <ndir.h> header file, and it defines `DIR'. */ /* Define if you have the <ndir.h> header file, and it defines `DIR'. */
#undef HAVE_NDIR_H #undef HAVE_NDIR_H
/* Define if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
/* Define if you have the `putenv' function. */
#undef HAVE_PUTENV
/* Define if you have the `putpwent' function. */ /* Define if you have the `putpwent' function. */
#undef HAVE_PUTPWENT #undef HAVE_PUTPWENT
@ -225,24 +167,6 @@
/* Define if you have the putgrent function. */ /* Define if you have the putgrent function. */
#undef HAVE_PUTGRENT #undef HAVE_PUTGRENT
/* Define if you have the `regcmp' function. */
#undef HAVE_REGCMP
/* Define if you have the `regcomp' function. */
#undef HAVE_REGCOMP
/* Define if you have the <regex.h> header file. */
#undef HAVE_REGEX_H
/* Define if you have the `re_comp' function. */
#undef HAVE_RE_COMP
/* Define if you have the `rmdir' function. */
#undef HAVE_RMDIR
/* Define if you have the `select' function. */
#undef HAVE_SELECT
/* Define if you have the <shadow.h> header file. */ /* Define if you have the <shadow.h> header file. */
#undef HAVE_SHADOW_H #undef HAVE_SHADOW_H
@ -255,52 +179,18 @@
/* Define if you have the `strcasestr' function. */ /* Define if you have the `strcasestr' function. */
#undef HAVE_STRCASESTR #undef HAVE_STRCASESTR
/* Define if you have the `strcspn' function. */
#undef HAVE_STRCSPN
/* Define if you have the `strdup' function. */
#undef HAVE_STRDUP
/* Define if you have the `strerror' function. */
#undef HAVE_STRERROR
/* Define if you have the `strftime' function. */
#undef HAVE_STRFTIME
/* Define if you have the <strings.h> header file. */ /* Define if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H #undef HAVE_STRINGS_H
/* Define if you have the <string.h> header file. */ /* Define if you have the <string.h> header file. */
#undef HAVE_STRING_H #undef HAVE_STRING_H
/* Define if you have the `strspn' function. */
#undef HAVE_STRSPN
/* Define if you have the `strstr' function. */
#undef HAVE_STRSTR
/* Define if you have the `strtol' function. */
#undef HAVE_STRTOL
/* Define if you have the `strtoul' function. */
#undef HAVE_STRTOUL
/* Define if `st_blksize' is member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
/* Define if `tm_zone' is member of `struct tm'. */ /* Define if `tm_zone' is member of `struct tm'. */
#undef HAVE_STRUCT_TM_TM_ZONE #undef HAVE_STRUCT_TM_TM_ZONE
/* Define if your `struct stat' has `st_blksize'. Deprecated, use
`HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */
#undef HAVE_ST_BLKSIZE
/* Define if you have the <syslog.h> header file. */ /* Define if you have the <syslog.h> header file. */
#undef HAVE_SYSLOG_H #undef HAVE_SYSLOG_H
/* Define to use syslog(). */
#undef USE_SYSLOG
/* Define if you have the <sys/dir.h> header file, and it defines `DIR'. */ /* Define if you have the <sys/dir.h> header file, and it defines `DIR'. */
#undef HAVE_SYS_DIR_H #undef HAVE_SYS_DIR_H
@ -328,14 +218,6 @@
/* Define if you have the <termios.h> header file. */ /* Define if you have the <termios.h> header file. */
#undef HAVE_TERMIOS_H #undef HAVE_TERMIOS_H
/* Define if your `struct tm' has `tm_zone'. Deprecated, use
`HAVE_STRUCT_TM_TM_ZONE' instead. */
#undef HAVE_TM_ZONE
/* Define if you don't have `tm_zone' but do have the external array `tzname'.
*/
#undef HAVE_TZNAME
/* Define if you have the <ulimit.h> header file. */ /* Define if you have the <ulimit.h> header file. */
#undef HAVE_ULIMIT_H #undef HAVE_ULIMIT_H
@ -419,3 +301,7 @@
/* Define as `fork' if `vfork' does not work. */ /* Define as `fork' if `vfork' does not work. */
#undef vfork #undef vfork
/* Define if you have the <iconv.h> header file. */
#undef HAVE_ICONV_H

248
configure vendored
View File

@ -4780,8 +4780,7 @@ fi
for ac_header in malloc.h sys/file.h sys/ioctl.h sys/time.h termios.h syslog.h sys/vfs.h unistd.h netinet/in.h regex.h
for ac_header in fcntl.h malloc.h sys/file.h sys/ioctl.h sys/time.h termios.h syslog.h sys/vfs.h unistd.h netinet/in.h regex.h
do do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then if eval "test \"\${$as_ac_Header+set}\" = set"; then
@ -6160,8 +6159,7 @@ fi
for ac_func in c64i a64l fchmod fchown fdatasync fsync lckpwdf strcasestr putpwent
for ac_func in c64i a64l fchmod fchown fdatasync fsync lckpwdf strcasestr mkstemp putpwent
do do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5 echo "$as_me:$LINENO: checking for $ac_func" >&5
@ -6244,79 +6242,6 @@ _ACEOF
fi fi
done done
echo "$as_me:$LINENO: checking for working POSIX fnmatch" >&5
echo $ECHO_N "checking for working POSIX fnmatch... $ECHO_C" >&6
if test "${ac_cv_func_fnmatch_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# Some versions of Solaris, SCO, and the GNU C Library
# have a broken or incompatible fnmatch.
# So we run a test program. If we are cross-compiling, take no chance.
# Thanks to John Oleynick, Franc,ois Pinard, and Paul Eggert for this test.
if test "$cross_compiling" = yes; then
ac_cv_func_fnmatch_works=cross
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <fnmatch.h>
# define y(a, b, c) (fnmatch (a, b, c) == 0)
# define n(a, b, c) (fnmatch (a, b, c) == FNM_NOMATCH)
int
main ()
{
exit
(!(y ("a*", "abc", 0)
&& n ("d*/*1", "d/s/1", FNM_PATHNAME)
&& y ("a\\\\bc", "abc", 0)
&& n ("a\\\\bc", "abc", FNM_NOESCAPE)
&& y ("*x", ".x", 0)
&& n ("*x", ".x", FNM_PERIOD)
&& 1));
;
return 0;
}
_ACEOF
rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_fnmatch_works=yes
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_func_fnmatch_works=no
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
echo "$as_me:$LINENO: result: $ac_cv_func_fnmatch_works" >&5
echo "${ECHO_T}$ac_cv_func_fnmatch_works" >&6
if test $ac_cv_func_fnmatch_works = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_FNMATCH 1
_ACEOF
fi
if test $ac_cv_c_compiler_gnu = yes; then if test $ac_cv_c_compiler_gnu = yes; then
echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
@ -6569,154 +6494,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF _ACEOF
for ac_func in strftime
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
{
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
char (*f) () = $ac_func;
#endif
#ifdef __cplusplus
}
#endif
int
main ()
{
return f != $ac_func;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
else
# strftime is in -lintl on SCO UNIX.
echo "$as_me:$LINENO: checking for strftime in -lintl" >&5
echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6
if test "${ac_cv_lib_intl_strftime+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char strftime ();
int
main ()
{
strftime ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_intl_strftime=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_strftime=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6
if test $ac_cv_lib_intl_strftime = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_STRFTIME 1
_ACEOF
LIBS="-lintl $LIBS"
fi
fi
done
echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5 echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5
echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6 echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6
if test "${ac_cv_func_utime_null+set}" = set; then if test "${ac_cv_func_utime_null+set}" = set; then
@ -7413,23 +7190,7 @@ done
for ac_func in gettimeofday re_comp select socket uname
for ac_func in getcwd gethostname gettimeofday getwd mkdir mktime putenv re_comp regcmp regcomp rmdir select socket strcspn strdup strerror strspn strstr strtol strtoul uname
do do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5 echo "$as_me:$LINENO: checking for $ac_func" >&5
@ -7516,8 +7277,7 @@ done
for ac_func in getspnam initgroups updwtmp updwtmpx
for ac_func in getspnam getutent initgroups updwtmp updwtmpx
do do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5 echo "$as_me:$LINENO: checking for $ac_func" >&5

10
configure.in
View File

@ -132,7 +132,7 @@ AC_HEADER_STDC
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_HEADER_TIME AC_HEADER_TIME
AC_HEADER_SYS_WAIT AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(fcntl.h malloc.h sys/file.h sys/ioctl.h sys/time.h termios.h syslog.h sys/vfs.h unistd.h netinet/in.h regex.h) AC_CHECK_HEADERS(malloc.h sys/file.h sys/ioctl.h sys/time.h termios.h syslog.h sys/vfs.h unistd.h netinet/in.h regex.h)
AC_CHECK_HEADERS(sys/resource.h usersec.h utime.h ulimit.h gshadow.h shadow.h) AC_CHECK_HEADERS(sys/resource.h usersec.h utime.h ulimit.h gshadow.h shadow.h)
AC_CHECK_HEADERS(limits.h utmp.h utmpx.h lastlog.h rpc/key_prot.h) AC_CHECK_HEADERS(limits.h utmp.h utmpx.h lastlog.h rpc/key_prot.h)
AC_CHECK_HEADERS(iconv.h) AC_CHECK_HEADERS(iconv.h)
@ -150,18 +150,16 @@ AC_HEADER_STAT
AC_STRUCT_TM AC_STRUCT_TM
dnl Checks for library functions. dnl Checks for library functions.
AC_CHECK_FUNCS(c64i a64l fchmod fchown fdatasync fsync lckpwdf strcasestr mkstemp putpwent) AC_CHECK_FUNCS(c64i a64l fchmod fchown fdatasync fsync lckpwdf strcasestr putpwent)
AC_FUNC_FNMATCH
AC_PROG_GCC_TRADITIONAL AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP AC_FUNC_MEMCMP
AC_FUNC_SETPGRP AC_FUNC_SETPGRP
AC_TYPE_SIGNAL AC_TYPE_SIGNAL
AC_FUNC_STRFTIME
AC_FUNC_UTIME_NULL AC_FUNC_UTIME_NULL
AC_FUNC_VFORK AC_FUNC_VFORK
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_CHECK_FUNCS(getcwd gethostname gettimeofday getwd mkdir mktime putenv re_comp regcmp regcomp rmdir select socket strcspn strdup strerror strspn strstr strtol strtoul uname) AC_CHECK_FUNCS(gettimeofday re_comp select socket uname)
AC_CHECK_FUNCS(getspnam getutent initgroups updwtmp updwtmpx) AC_CHECK_FUNCS(getspnam initgroups updwtmp updwtmpx)
dnl Check for external programs dnl Check for external programs
AC_PATH_PROG(COMPRESS,compress,no-compress-found-during-configure) AC_PATH_PROG(COMPRESS,compress,no-compress-found-during-configure)

2
lib/libs.h
View File

@ -83,7 +83,9 @@
#include <setjmp.h> #include <setjmp.h>
#include <grp.h> #include <grp.h>
#include <sys/resource.h> #include <sys/resource.h>
#ifdef HAVE_ICONV_H
#include <iconv.h> #include <iconv.h>
#endif
#pragma pack(1) #pragma pack(1)

12
lib/parsedate.c
View File

@ -27,7 +27,7 @@
#if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE) && !defined(HAVE_DECLARED_TIMEZONE) #if !defined(HAVE_STRUCT_TM_TM_ZONE) && !defined(_TIMEZONE) && !defined(HAVE_DECLARED_TIMEZONE)
extern time_t timezone; extern time_t timezone;
#endif #endif
@ -1418,10 +1418,10 @@ int GetTimeInfo(TIMEINFO *Now)
#if defined(HAVE_GETTIMEOFDAY) #if defined(HAVE_GETTIMEOFDAY)
struct timeval tv; struct timeval tv;
#endif /* defined(HAVE_GETTIMEOFDAY) */ #endif /* defined(HAVE_GETTIMEOFDAY) */
#if !defined(HAVE_TM_ZONE) #if !defined(HAVE_STRUCT_TM_TM_ZONE)
struct tm local; struct tm local;
struct tm gmt; struct tm gmt;
#endif /* !defined(HAVE_TM_ZONE) */ #endif /* !defined(HAVE_STRUCT_TM_TM_ZONE) */
/* Get the basic time. */ /* Get the basic time. */
#if defined(HAVE_GETTIMEOFDAY) #if defined(HAVE_GETTIMEOFDAY)
@ -1440,7 +1440,7 @@ int GetTimeInfo(TIMEINFO *Now)
if ((tm = localtime(&Now->time)) == NULL) if ((tm = localtime(&Now->time)) == NULL)
return -1; return -1;
secondsUntilNextHour = 60 * (60 - tm->tm_min) - tm->tm_sec; secondsUntilNextHour = 60 * (60 - tm->tm_min) - tm->tm_sec;
#if !defined(HAVE_TM_ZONE) #if !defined(HAVE_STRUCT_TM_TM_ZONE)
/* To get the timezone, compare localtime with GMT. */ /* To get the timezone, compare localtime with GMT. */
local = *tm; local = *tm;
if ((tm = gmtime(&Now->time)) == NULL) if ((tm = gmtime(&Now->time)) == NULL)
@ -1462,7 +1462,7 @@ int GetTimeInfo(TIMEINFO *Now)
LastTzone += gmt.tm_min - local.tm_min; LastTzone += gmt.tm_min - local.tm_min;
#else #else
LastTzone = (0 - tm->tm_gmtoff) / 60; LastTzone = (0 - tm->tm_gmtoff) / 60;
#endif /* defined(HAVE_TM_ZONE) */ #endif /* defined(HAVE_STRUCT_TM_TM_ZONE) */
NextHour = Now->time + secondsUntilNextHour; NextHour = Now->time + secondsUntilNextHour;
} }
Now->tzone = LastTzone; Now->tzone = LastTzone;
@ -1743,7 +1743,7 @@ time_t parsedate(char *p, TIMEINFO *now)
yyYear = tm->tm_year + 1900; yyYear = tm->tm_year + 1900;
yyMonth = tm->tm_mon + 1; yyMonth = tm->tm_mon + 1;
yyDay = tm->tm_mday; yyDay = tm->tm_mday;
#ifdef HAVE_TM_ZONE #ifdef HAVE_STRUCT_TM_TM_ZONE
yyTimezone = tm->tm_gmtoff/60; yyTimezone = tm->tm_gmtoff/60;
#else #else
yyTimezone = timezone/60; yyTimezone = timezone/60;

6
mbcico/zmrecv.c
View File

@ -4,7 +4,7 @@
* Purpose ...............: Fidonet mailer * Purpose ...............: Fidonet mailer
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2001 * Copyright (C) 1997-2003
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -46,10 +46,6 @@
#include "openport.h" #include "openport.h"
#ifndef BELEIVE_ZFIN
#define BELEIVE_ZFIN 2
#endif
static FILE *fout=NULL; static FILE *fout=NULL;
static int Usevhdrs; static int Usevhdrs;