changeset 21630:1c34b63076df

merge of '2cbd8db1d77e345ea55b3b765ca79726273ca727' and '4f88abe06fd8a1d074983f3cf8aeb93d06d57f5f'
author Stu Tomlinson <stu@nosnilmot.com>
date Fri, 23 Nov 2007 19:42:47 +0000
parents 512785bd7fcb (current diff) b2aa68cdc8b9 (diff)
children f472035d6c77 a9cb48039d3b
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/util.c	Fri Nov 23 04:06:23 2007 +0000
+++ b/libpurple/util.c	Fri Nov 23 19:42:47 2007 +0000
@@ -897,7 +897,7 @@
 
 	if (tm != NULL)
 	{
-		memcpy(tm, &t, sizeof(struct tm));
+		*tm = t;
 		tm->tm_isdst = -1;
 		mktime(tm);
 	}