diff options
| author | Simon Josefsson <simon@josefsson.org> | 2009-05-11 13:36:44 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2009-05-11 13:36:44 +0200 |
| commit | 19b635a93afa204a634d1967bb258ddd386e0929 (patch) | |
| tree | 287cdf648189874376031389ad44e58e9427f87f /gl | |
| parent | b46bb5678b5a6e82da798f62aac06026e75ba418 (diff) | |
| download | gnutls-19b635a93afa204a634d1967bb258ddd386e0929.tar.gz | |
Update gnulib files.
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/sys_socket.in.h | 14 | ||||
| -rwxr-xr-x | gl/tests/test-vc-list-files-git.sh | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/gl/sys_socket.in.h b/gl/sys_socket.in.h index 87eed880ce..dadd56ac58 100644 --- a/gl/sys_socket.in.h +++ b/gl/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 { diff --git a/gl/tests/test-vc-list-files-git.sh b/gl/tests/test-vc-list-files-git.sh index a42aec19a4..f1627e7e50 100755 --- a/gl/tests/test-vc-list-files-git.sh +++ b/gl/tests/test-vc-list-files-git.sh @@ -1,6 +1,6 @@ #!/bin/sh # Unit tests for vc-list-files -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify @@ -36,6 +36,8 @@ mkdir $tmpdir && cd $tmpdir && || { echo "Skipping test: git not found in PATH"; (exit 77); exit 77; }; } && mkdir d && touch d/a b c && + git config user.email "you@example.com" + git config user.name "Your Name" git add . > /dev/null && git commit -q -a -m log && printf '%s\n' b c d/a > expected && |