From: Ben Pfaff <blp@cs.stanford.edu>
Date: Wed, 21 Apr 2010 04:20:30 +0000 (-0700)
Subject: perl-module: Avoid compiler warning from conflicting "my_strftime" macros.
X-Git-Tag: v0.7.5~53
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2982877c3189067133f51d199c53e01453ae9ebb;p=pspp-builds.git

perl-module: Avoid compiler warning from conflicting "my_strftime" macros.

Avoids the following warnings:

In file included from /usr/lib/perl/5.10/CORE/perl.h:953,
                 from PSPP.xs:23:
/usr/lib/perl/5.10/CORE/embed.h:2803:1: warning: "my_strftime" redefined
In file included from PSPP.xs:20:
/home/blp/pspp/output/_build/config.h:1968:1: warning: this is the location of the previous definition
---

diff --git a/perl-module/PSPP.xs b/perl-module/PSPP.xs
index bc7961e6..ca3f873a 100644
--- a/perl-module/PSPP.xs
+++ b/perl-module/PSPP.xs
@@ -1,5 +1,5 @@
 /* PSPP - computes sample statistics.
-   Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -19,6 +19,12 @@
 
 #include <config.h>
 
+/* The Gnulib "strftime" module defines my_strftime in <config.h> for use by
+   gl/strftime.c.  Perl also defines my_strftime in embed.h for some other
+   purpose.  The former definition doesn't matter in this file, so suppress it
+   to avoid a compiler warning. */
+#undef my_strftime
+
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"