2002-03-21
2002-03-21 14:04:28 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
47ba81d2e717589bdf032b4ef8b2dccb31b04903
(17 lines)
(+12/-5)
[
Show
| Annotate
]
Branch: 7.9
Added one more check for tm.__tm_gmtoff.
Rev: src/builtin_functions.c:1.425
5:
\*/
/**/
#include "global.h"
- RCSID("$Id: builtin_functions.c,v 1.424 2002/03/21 13:41:06 grubba Exp $");
+ RCSID("$Id: builtin_functions.c,v 1.425 2002/03/21 14:04:28 grubba Exp $");
#include "interpret.h"
#include "svalue.h"
#include "pike_macros.h"
4008: Inside #if defined(HAVE_LOCALTIME)
pop_n_elems(args);
encode_struct_tm(tm);
- #ifdef HAVE_EXTERNAL_TIMEZONE
+ #ifdef STRUCT_TM_HAS_GMTOFF
push_string(make_shared_string("timezone"));
- push_int(timezone);
+ push_int(-tm->tm_gmtoff);
f_aggregate_mapping(20);
#else
- #ifdef STRUCT_TM_HAS_GMTOFF
+ #ifdef STRUCT_TM_HAS___TM_GMTOFF
push_string(make_shared_string("timezone"));
- push_int(-tm->tm_gmtoff);
+ push_int(-tm->__tm_gmtoff);
f_aggregate_mapping(20);
#else
-
+ #ifdef HAVE_EXTERNAL_TIMEZONE
+ push_string(make_shared_string("timezone"));
+ push_int(timezone);
+ f_aggregate_mapping(20);
+ #else
f_aggregate_mapping(18);
#endif
#endif
-
+ #endif
}
#endif