summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2013-08-09 15:49:24 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-08-09 15:52:13 +0100
commitb5138f5abc201c6f3140e1bafa0c8f52031339f4 (patch)
treead0a1c4fd6923c38dcff7f8f31c0b9b82f5a9270
parentcb6fa296255213c842ca119ab4b0e1796e8a2c6e (diff)
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@collabora.co.uk>
-rw-r--r--NEWS3
-rw-r--r--src/media-stream.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index c8db1d084..6458e4c21 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 2174f52df..0fb3504cb 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);