With clang 3.3, I've got a warning in GSAvahiNetService.m about an
incompatible pointer types assignment for _infoLock ivar.

I send two alternate patches for that. Take the one that looks good for
you.

Regards.
-- 
Jean-Charles BERTIN
Axinoe - Software Engineer
Tel.: (+33) (0)1.80.82.59.23
Fax : (+33) (0)1.80.82.59.29
Skype: jcbertin
Web: <http://www.axinoe.com/>
Certificate Authority: <https://ca.axinoe.com/axinoe-root.crt>
diff --git a/Source/GSNetServices.h b/Source/GSNetServices.h
index 6ec462a..83f1844 100644
--- a/Source/GSNetServices.h
+++ b/Source/GSNetServices.h
@@ -67,6 +67,7 @@ typedef enum
 NSString* GSNetServiceDotTerminatedNSStringFromString(const char* string);
 
 @class GSAvahiRunLoopContext, NSTimer, NSLock, NSRecursiveLock, NSMutableDictionary, NSMapTable;
+@protocol NSLocking;
 
 /**
  * NSNetService using the avahi-client API.
@@ -80,7 +81,7 @@ NSString* GSNetServiceDotTerminatedNSStringFromString(const char* string);
   NSRecursiveLock *_lock;
   // Ivars for this class:
   NSMutableDictionary *_info;
-  NSLock *_infoLock;
+  NSObject<NSLocking> *_infoLock;
   NSUInteger _infoSeq;
   GSNetServiceState _serviceState;
   int _ifIndex;
From acce262b9290674a206777888588c8215f6858e2 Mon Sep 17 00:00:00 2001
From: Jean-Charles BERTIN <jc.ber...@axinoe.com>
Date: Fri, 8 Mar 2013 14:48:01 +0100
Subject: [PATCH 2/7] Fixed ivar _infoLock definition for GSAvahiNetService.

---
 Source/GSNetServices.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/GSNetServices.h b/Source/GSNetServices.h
index ead40e9..2188320 100644
--- a/Source/GSNetServices.h
+++ b/Source/GSNetServices.h
@@ -79,7 +79,7 @@ NSString* GSNetServiceDotTerminatedNSStringFromString(const char* string);
   NSRecursiveLock *_lock;
   // Ivars for this class:
   NSMutableDictionary *_info;
-  NSLock *_infoLock;
+  NSRecursiveLock *_infoLock;
   NSUInteger _infoSeq;
   GSNetServiceState _serviceState;
   int _ifIndex;
-- 
1.8.1.5

Attachment: smime.p7s
Description: S/MIME cryptographic signature

_______________________________________________
Gnustep-dev mailing list
Gnustep-dev@gnu.org
https://lists.gnu.org/mailman/listinfo/gnustep-dev

Reply via email to