[FIX] cherry-pick 6ff4756c4413698f3d67ae7ef5c650c1cff5a57f

patch for gcc 4.8 build

Change-Id: Ica59517e5128594ffd7d0266f84afaf78f1b7472

Conflicts:
	probe_socket/libdasocket.c

diff --git a/probe_socket/libdasocket.c b/probe_socket/libdasocket.c
index 1eb671e..bab324a 100644 (file)
--- a/probe_socket/libdasocket.c
+++ b/probe_socket/libdasocket.c
@@ -49,8 +49,14 @@
 #include "dahelper.h"
 #include "da_socket.h"
 
+
 #include "binproto.h"
 
+#define GCC_VERSION (__GNUC__ * 10000 \
+               + __GNUC__MINOR__ * 100 \
+               + __GNUC_PATCHLEVEL__ )
+
+
 static enum DaOptions _sopt = OPT_FILE;
 
 int socket(int domain, int type, int protocol)
@@ -879,10 +885,15 @@ int getpeername(int s, struct sockaddr *addr, socklen_t *len)
        return ret;
 }
 
+#if GCC_VERSION < 40800
 int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, socklen_t hostlen, char *serv, socklen_t servlen, unsigned int flags)
 {
        static int (*getnameinfop)(const struct sockaddr *sa, socklen_t salen, char *host, socklen_t hostlen, char *serv, socklen_t servlen, unsigned int flags);
- 
+#else 
+int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags)
+{
+       static int (*getnameinfop)(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags);
+#endif 
        BEFORE_ORIGINAL(getnameinfo, LIBC);
  
        ret = getnameinfop(sa, salen,host, hostlen, serv, servlen, flags);