From: Bruno Haible <bruno@clisp.org>
Date: Fri, 8 May 2009 22:01:36 +0000 (+0200)
Subject: Don't use undefined macro 'max'.
X-Git-Tag: v0.1~5928
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=87b039263152f63b9f799e486fb76bb45b3f6820;p=gnulib.git

Don't use undefined macro 'max'.
---

diff --git a/ChangeLog b/ChangeLog
index a3e7c3bf1..2f2055db1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-08  Bruno Haible  <bruno@clisp.org>
+
+	* lib/sys_socket.in.h (_SS_PADSIZE): Use a conditional expression
+	instead of 'max'.
+
 2009-05-08  Simon Josefsson  <simon@josefsson.org>
 
 	* m4/sys_socket_h.m4: Test for ws2tcpip.h earlier, needed for
diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h
index 50d9d3d67..0ce7e9b9b 100644
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -44,14 +44,16 @@
 #define _GL_SYS_SOCKET_H
 
 #if !@HAVE_STRUCT_SOCKADDR_STORAGE@
-#include <alignof.h>
+# include <alignof.h>
 /* Code taken from glibc sysdeps/unix/sysv/linux/bits/socket.h on
    2009-05-08, licensed under LGPLv2.1+, plus portability fixes. */
-#define __ss_aligntype  unsigned long int
-#define _SS_SIZE	256
-#define _SS_PADSIZE	(_SS_SIZE - (max (sizeof (sa_family_t),		\
-					  alignof (__ss_aligntype))	\
-				     + sizeof (__ss_aligntype)))
+# define __ss_aligntype unsigned long int
+# define _SS_SIZE 256
+# define _SS_PADSIZE \
+    (_SS_SIZE - ((sizeof (sa_family_t) >= alignof (__ss_aligntype)	\
+		  ? sizeof (sa_family_t)				\
+		  : alignof (__ss_aligntype))				\
+		 + sizeof (__ss_aligntype)))
 
 struct sockaddr_storage
 {