[Libreoffice-commits] .: sal/osl solenv/gbuild

[Stephan Bergmann]

 sal/osl/unx/system.c             |    2 +-
 sal/osl/unx/system.h             |    2 +-
 solenv/gbuild/platform/macosx.mk |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f039057048f850f9b43c297258342fb3bc869a6f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Dec 19 13:06:09 2011 +0100

    Warning clean-up (Mac OS X).

diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index bf8607d..b74aff5 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -38,7 +38,7 @@ static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
 extern int h_errno;
 
 struct hostent *gethostbyname_r(const char *name, struct hostent *result,
-                                char *buffer, int buflen, int *h_errnop)
+                                char *buffer, size_t buflen, int *h_errnop)
 {
     /* buffer layout:   name\0
      *                  array_of_pointer_to_aliases
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 71b9b31..3c54785 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -490,7 +490,7 @@ struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
 #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
 #if !defined(FREEBSD) || (__FreeBSD_version < 601103)
 struct hostent *gethostbyname_r(const char *name, struct hostent *result,
-                                char *buffer, int buflen, int *h_errnop);
+                                char *buffer, size_t buflen, int *h_errnop);
 #endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
 #endif
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index cef2015..fb02a58 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -55,9 +55,9 @@ gb_COMPILERDEFS += \
 gb_CFLAGS := \
 	-isysroot $(gb_SDKDIR) \
 	$(gb_CFLAGS_COMMON) \
-	-Wshadow \
 	-fPIC \
 	-fno-strict-aliasing \
+    #-Wshadow \ break in compiler headers already
 
 gb_CXXFLAGS := \
 	-isysroot $(gb_SDKDIR) \