From: Bruno Haible <bruno@clisp.org>
Date: Sun, 9 Aug 2009 07:15:28 +0000 (+0200)
Subject: Avoid compilation error in C++ mode.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47aaecc85cb2a374c6c3d6945dbf3d18df065838;p=pspp

Avoid compilation error in C++ mode.
---

diff --git a/ChangeLog b/ChangeLog
index e3e562fb53..b8b59608f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-08  Bruno Haible  <bruno@clisp.org>
+
+	Avoid compilation error in C++ mode.
+	* lib/gettimeofday.c (rpl_gettimeofday): Cast timezone argument.
+	Reported by Sam Steingold <sds@gnu.org>.
+
 2009-08-08  Bruno Haible  <bruno@clisp.org>
 
 	* m4/gethostname.m4 (gl_FUNC_GETHOSTNAME): Define HOST_NAME_MAX also
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index 7e711f790d..1cf752af8b 100644
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -1,6 +1,6 @@
 /* Provide gettimeofday for systems that don't have it or for which it's broken.
 
-   Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007 Free Software
+   Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2009 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -111,7 +111,7 @@ rpl_gettimeofday (struct timeval *restrict tv, void *restrict tz)
   struct tm save = *localtime_buffer_addr;
 # endif
 
-  int result = gettimeofday (tv, tz);
+  int result = gettimeofday (tv, (struct timezone *) tz);
 
 # if GETTIMEOFDAY_CLOBBERS_LOCALTIME
   *localtime_buffer_addr = save;