MonetDB: Jun2010 - Accept merge

[mk]

Changeset: 2a834b46473a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a834b46473a
Modified Files:
        
Branch: Jun2010
Log Message:

Accept merge


diffs (15 lines):

diff -r 2b7eec81b411 -r 2a834b46473a clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx       Tue Jul 27 18:02:50 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx       Tue Jul 27 18:03:49 2010 +0200
@@ -2339,10 +2339,9 @@
 #ifdef HAVE_SYS_UN_H
        if (mid->hostname == NULL) {
                struct stat st;
-               struct sockaddr_un s; /* just for sizeof(s.sun_path) */
                snprintf(errbuf, sizeof(errbuf),
                         CLIENTS_PREFIX "/var/MonetDB5/dbfarm/mapi_socket");
-               if (strlen(errbuf) <= sizeof(s.sun_path) &&
+               if (strlen(errbuf) <= sizeof(((struct sockaddr_un *) 
0)->sun_path) &&
                                stat(errbuf, &st) != 1 &&
                                S_ISSOCK(st.st_mode))
                        mid->hostname = strdup(errbuf);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list