# HG changeset patch # User Benjamin Lindner # Date 1250187632 -7200 # Node ID d2cd38f7608e226e8ba834dee57e29fa54366199 # Parent c87030dce4d9c34b7fc46f276b7cb8e9e3778e0f skip double declaration of tztime diff --git a/liboctave/strftime.c b/liboctave/strftime.c --- a/liboctave/strftime.c +++ b/liboctave/strftime.c @@ -49,7 +49,7 @@ # endif #endif -#if HAVE_TZNAME +#if HAVE_TZNAME && !HAVE_DECL_TZNAME extern OCTAVE_IMPORT char *tzname[]; #endif