telepathy-gabble: errno is actually a reserved word in C, avoid it

[Simon McVittie]

Module: telepathy-gabble
Branch: master
Commit: b5138f5abc201c6f3140e1bafa0c8f52031339f4
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=b5138f5abc201c6f3140e1bafa0c8f52031339f4

Author: Samuel Thibault <sthibault at debian.org>
Date:   Fri Aug  9 15:49:24 2013 +0100

errno is actually a reserved word in C, avoid it

[Commit message added -smcv]

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714534
Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>

---

 NEWS               |    3 +++
 src/media-stream.h |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index c8db1d0..6458e4c 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,9 @@ Fixes since 0.17.6:
 • fd.o #67828: fix a test failure with telepathy-glib 0.20.3/0.21.1 or later
   (Simon)
 
+• Debian #714534: avoid naming a function parameter "errno", which
+  is technically a reserved word (Samuel Thibault)
+
 telepathy-gabble 0.17.5 (2013-06-06)
 ====================================
 
diff --git a/src/media-stream.h b/src/media-stream.h
index 2174f52..0fb3504 100644
--- a/src/media-stream.h
+++ b/src/media-stream.h
@@ -86,7 +86,7 @@ GType gabble_media_stream_get_type (void);
 #define MAKE_COMBINED_DIRECTION(d, p) \
     ((CombinedStreamDirection) ((d) | ((p) << 2)))
 
-gboolean gabble_media_stream_error (GabbleMediaStream *self, guint errno,
+gboolean gabble_media_stream_error (GabbleMediaStream *self, guint errnum,
     const gchar *message, GError **error);
 
 void gabble_media_stream_close (GabbleMediaStream *close);