From 8eb15d99d86daa78f9799264f1fcea27fd4ad8e3 Mon Sep 17 00:00:00 2001
From: theraven <theraven@72102866-910b-0410-8b05-ffd578937521>
Date: Sat, 7 Apr 2012 10:45:30 +0000
Subject: [PATCH] Fix the remaining compiler warnings.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35044 72102866-910b-0410-8b05-ffd578937521
---
 Source/GSSocketStream.m    | 24 +++++++++++++++---------
 Source/NSAffineTransform.m |  2 +-
 Source/NSXMLDTDNode.m      |  4 ++--
 Tools/xmlparse.m           |  6 +++---
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Source/GSSocketStream.m b/Source/GSSocketStream.m
index d94196255..c2a267355 100644
--- a/Source/GSSocketStream.m
+++ b/Source/GSSocketStream.m
@@ -80,13 +80,14 @@ GSPrivateSockaddrHost(struct sockaddr *addr)
 #if     defined(AF_INET6)
   if (AF_INET6 == addr->sa_family)
     {
-      struct sockaddr_in6	*addr6 = (struct sockaddr_in6*)addr;
+      struct sockaddr_in6	*addr6 = (struct sockaddr_in6*)(void*)addr;
 
       inet_ntop(AF_INET, &addr6->sin6_addr, buf, sizeof(buf));
       return [NSString stringWithUTF8String: buf];
     } 
 #endif
-  inet_ntop(AF_INET, &((struct sockaddr_in*)addr)->sin_addr, buf, sizeof(buf));
+  inet_ntop(AF_INET, &((struct sockaddr_in*)(void*)addr)->sin_addr,
+		  buf, sizeof(buf));
   return [NSString stringWithUTF8String: buf];
 }
 
@@ -106,14 +107,14 @@ GSPrivateSockaddrPort(struct sockaddr *addr)
 #if     defined(AF_INET6)
   if (AF_INET6 == addr->sa_family)
     {
-      struct sockaddr_in6	*addr6 = (struct sockaddr_in6*)addr;
+      struct sockaddr_in6	*addr6 = (struct sockaddr_in6*)(void*)addr;
 
       port = addr6->sin6_port;
       port = GSSwapBigI16ToHost(port);
       return port;
     } 
 #endif
-  port = ((struct sockaddr_in*)addr)->sin_port;
+  port = ((struct sockaddr_in*)(void*)addr)->sin_port;
   port = GSSwapBigI16ToHost(port);
   return port;
 }
@@ -147,7 +148,7 @@ GSPrivateSockaddrSetup(NSString *machine, uint16_t port,
 	}
       if (0 == strchr(n, ':'))
 	{
-	  struct sockaddr_in	*addr = (struct sockaddr_in*)sin;
+	  struct sockaddr_in	*addr = (struct sockaddr_in*)(void*)sin;
 
 	  if (inet_pton(AF_INET, n, &addr->sin_addr) <= 0)
 	    {
@@ -157,7 +158,7 @@ GSPrivateSockaddrSetup(NSString *machine, uint16_t port,
       else
 	{
 #if     defined(AF_INET6)
-	  struct sockaddr_in6	*addr6 = (struct sockaddr_in6*)sin;
+	  struct sockaddr_in6	*addr6 = (struct sockaddr_in6*)(void*)sin;
 
 	  sin->sa_family = AF_INET6;
 	  if (inet_pton(AF_INET6, n, &addr6->sin6_addr) <= 0)
@@ -171,7 +172,7 @@ GSPrivateSockaddrSetup(NSString *machine, uint16_t port,
     }
   else
     {
-      ((struct sockaddr_in*)sin)->sin_addr.s_addr
+      ((struct sockaddr_in*)(void*)sin)->sin_addr.s_addr
 	= GSSwapHostI32ToBig(INADDR_ANY);
     }
 
@@ -229,11 +230,11 @@ GSPrivateSockaddrSetup(NSString *machine, uint16_t port,
 #if     defined(AF_INET6)
   if (AF_INET6 == sin->sa_family)
     {
-      ((struct sockaddr_in6*)sin)->sin6_port = GSSwapHostI16ToBig(port);
+      ((struct sockaddr_in6*)(void*)sin)->sin6_port = GSSwapHostI16ToBig(port);
     }
   else
     {
-      ((struct sockaddr_in*)sin)->sin_port = GSSwapHostI16ToBig(port);
+      ((struct sockaddr_in*)(void*)sin)->sin_port = GSSwapHostI16ToBig(port);
     }
 #else
   ((struct sockaddr_ind*)sin)->sin6_port = GSSwapHostI16ToBig(port);
@@ -347,6 +348,11 @@ GSPrivateSockaddrSetup(NSString *machine, uint16_t port,
 /* Temporarily redefine 'id' in case the headers use the objc reserved word.
  */
 #define	id	GNUTLSID
+/* gcrypt uses __attribute__((deprecated)) to mark structure members that are
+ * private.  This causes compiler warnings just from using the header.  Turn
+ * them off...
+ */
+#define	_GCRYPT_IN_LIBGCRYPT
 #include <gnutls/gnutls.h>
 #include <gcrypt.h>
 #undef	id
diff --git a/Source/NSAffineTransform.m b/Source/NSAffineTransform.m
index 531b2d384..4031329ec 100644
--- a/Source/NSAffineTransform.m
+++ b/Source/NSAffineTransform.m
@@ -668,7 +668,7 @@ static NSAffineTransformStruct identityTransform = {
           else
             {
               // FIXME
-              NSLog(@"Got data %@ len %d for affine transform", d, length);
+              NSLog(@"Got data %@ len %d for affine transform", d, (int)length);
               return [self notImplemented: _cmd];
             }
         }
diff --git a/Source/NSXMLDTDNode.m b/Source/NSXMLDTDNode.m
index c1e28e450..dc9ef4594 100644
--- a/Source/NSXMLDTDNode.m
+++ b/Source/NSXMLDTDNode.m
@@ -109,9 +109,9 @@ GS_PRIVATE_INTERNAL(NSXMLDTDNode)
  return StringFromXMLStringPtr(internal->node->ExternalID);
 }
 
-- (void) setDTDKind: (NSXMLDTDNodeKind)kind
+- (void) setDTDKind: (NSXMLDTDNodeKind)nodeKind
 {
-  internal->DTDKind = kind;
+  internal->DTDKind = nodeKind;
 }
 
 - (void) setNotationName: (NSString*)notationName
diff --git a/Tools/xmlparse.m b/Tools/xmlparse.m
index c0ea953c1..d11b1d271 100644
--- a/Tools/xmlparse.m
+++ b/Tools/xmlparse.m
@@ -30,11 +30,11 @@
 #import	"Foundation/NSUserDefaults.h"
 #import "GNUstepBase/Additions.h"
 
-@interface GSXMLParser (Loader)
+@interface GSXMLParse : GSXMLParser 
 + (NSString*) loadEntity: (NSString*)publicId
                       at: (NSString*)location;
 @end
-@implementation	GSXMLParser (Loader)
+@implementation	GSXMLParse : GSXMLParser 
 + (NSString*) loadEntity: (NSString*)publicId
                       at: (NSString*)location
 {
@@ -95,7 +95,7 @@ main(int argc, char **argv, char **env)
       GSXMLNode		*root;
       GSXMLParser	*parser;
 
-      parser = [GSXMLParser parserWithContentsOfFile: file];
+      parser = [GSXMLParse parserWithContentsOfFile: file];
       [parser substituteEntities: NO];
       [parser doValidityChecking: YES];
       [parser keepBlanks: NO];