Author: lha Date: 2006-10-19 05:01:27 +0000 (Thu, 19 Oct 2006) New Revision: 594
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=594 Log: merge from heimdal cvs - rename timegm to _der_timegm Modified: trunk/heimdal/lib/asn1/der_locl.h Changeset: Modified: trunk/heimdal/lib/asn1/der_locl.h =================================================================== --- trunk/heimdal/lib/asn1/der_locl.h 2006-10-19 04:53:46 UTC (rev 593) +++ trunk/heimdal/lib/asn1/der_locl.h 2006-10-19 05:01:27 UTC (rev 594) @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: der_locl.h,v 1.6 2005/07/12 06:27:22 lha Exp $ */ +/* $Id: der_locl.h,v 1.7 2006/10/19 04:59:48 lha Exp $ */ #ifndef __DER_LOCL_H__ #define __DER_LOCL_H__ @@ -54,7 +54,7 @@ #include <der.h> #ifndef HAVE_TIMEGM -time_t timegm (struct tm *); +time_t _der_timegm (struct tm *); #endif size_t _heim_len_unsigned (unsigned);
