From: Eric Blake <eblake@redhat.com>
Date: Sat, 7 Sep 2013 13:23:32 +0000 (-0600)
Subject: glob: fix build for platforms without __THROW
X-Git-Tag: v0.1~52
X-Git-Url: https://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=465099e8fbb10768d061f36946eb94ccea37d98a

glob: fix build for platforms without __THROW

The previous fix for glibc broke builds on non-glibc platforms
that don't pre-define __THROW.  Perhaps we could make the code
more optimal by using gcc attributes instead of expanding to
nothing, to match the glibc usage; but for now this fixes the
build.  Reproted by Tom G. Christensen.

* lib/glob.in.h (__THROW): Add definition again.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 5ef6557e2..efc03d17e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-07  Eric Blake  <eblake@redhat.com>
+
+	glob: fix build for platforms without __THROW
+	* lib/glob.in.h (__THROW): Add definition again.
+
 2013-09-04  Anton Ovchinnikov  <revolver112@gmail.com>  (tiny change)
 
 	regex-quote: fix buffer access out of bounds
diff --git a/lib/glob.in.h b/lib/glob.in.h
index c242d97b3..73cbaa5bc 100644
--- a/lib/glob.in.h
+++ b/lib/glob.in.h
@@ -40,6 +40,8 @@
 #  define __END_DECLS
 # endif
 #endif
+#ifndef __THROW
+# define __THROW
 #ifndef __THROWNL
 # define __THROWNL
 #endif