From c5f76721ce9d10b127d54e127ac34e555c749465 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 10 Nov 2013 18:48:55 +0000
Subject: [PATCH] Fixed compile error for -Wduplicate-decl-specifier on OSX

---
 src/contact.h     | 2 +-
 src/ui/core.c     | 4 ++--
 src/xmpp/roster.c | 2 +-
 src/xmpp/xmpp.h   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/contact.h b/src/contact.h
index e71e0f7d..20c0e3dd 100644
--- a/src/contact.h
+++ b/src/contact.h
@@ -35,7 +35,7 @@ gboolean p_contact_remove_resource(PContact contact, const char * const resource
 void p_contact_free(PContact contact);
 const char* p_contact_barejid(PContact contact);
 const char* p_contact_name(PContact contact);
-const char * p_contact_name_or_jid(const PContact contact);
+const char* p_contact_name_or_jid(const PContact contact);
 const char* p_contact_presence(PContact contact);
 const char* p_contact_status(PContact contact);
 const char* p_contact_subscription(const PContact contact);
diff --git a/src/ui/core.c b/src/ui/core.c
index 2249a944..a6c54faf 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -965,8 +965,8 @@ ui_new_chat_win(const char * const to)
 
         if (contact != NULL) {
             if (strcmp(p_contact_presence(contact), "offline") == 0) {
-                const char const *show = p_contact_presence(contact);
-                const char const *status = p_contact_status(contact);
+                const char * const show = p_contact_presence(contact);
+                const char * const status = p_contact_status(contact);
                 _show_status_string(window, to, show, status, NULL, "--", "offline");
             }
         }
diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c
index c073464d..5fbb7be7 100644
--- a/src/xmpp/roster.c
+++ b/src/xmpp/roster.c
@@ -518,7 +518,7 @@ roster_barejid_from_name(const char * const name)
 }
 
 PContact
-roster_get_contact(const char const *barejid)
+roster_get_contact(const char * const barejid)
 {
     return g_hash_table_lookup(contacts, barejid);
 }
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index 407fe0e2..f1b3ba6c 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -127,7 +127,7 @@ void caps_close(void);
 void roster_clear(void);
 gboolean roster_update_presence(const char * const barejid,
     Resource *resource, GDateTime *last_activity);
-PContact roster_get_contact(const char const *barejid);
+PContact roster_get_contact(const char * const barejid);
 gboolean roster_contact_offline(const char * const barejid,
     const char * const resource, const char * const status);
 void roster_reset_search_attempts(void);