diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-02-17 08:29:09 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-02-17 08:29:09 +0000 |
| commit | bc5ff99474cc1ca67c14471b8c95244542740ef8 (patch) | |
| tree | 84917adb6e715184675c69737df07cdbdaeb0814 /ext | |
| parent | e9bdbbdb755ee451302c3d834ad20f77d80754f0 (diff) | |
2000-02-17
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/getaddrinfo.c | 2 | ||||
| -rw-r--r-- | ext/socket/getnameinfo.c | 2 | ||||
| -rw-r--r-- | ext/socket/socket.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index d89c7851be..fbedac4cbb 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -38,6 +38,7 @@ * - PF_UNSPEC case would be handled in getipnodebyname() with the AI_ALL flag. */ +#include "config.h" #include <sys/types.h> #ifndef NT #include <sys/param.h> @@ -66,7 +67,6 @@ #include <socks.h> #endif -#include "config.h" #include "addrinfo.h" #include "sockport.h" diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c index 6a71d1d6f6..774177c8c1 100644 --- a/ext/socket/getnameinfo.c +++ b/ext/socket/getnameinfo.c @@ -34,6 +34,7 @@ * but INRIA implementation returns EAI_xxx defined for getaddrinfo(). */ +#include "config.h" #include <sys/types.h> #ifndef NT #include <sys/socket.h> @@ -60,7 +61,6 @@ #include <socks.h> #endif -#include "config.h" #include "addrinfo.h" #include "sockport.h" diff --git a/ext/socket/socket.c b/ext/socket/socket.c index ce5b12dfc2..a3ba1925b2 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -86,7 +86,7 @@ int Rconnect(); * RFC 2553: protocol-independent placeholder for socket addresses */ #define _SS_MAXSIZE 128 -#define _SS_ALIGNSIZE (sizeof(long long)) +#define _SS_ALIGNSIZE (sizeof(double)) #define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(unsigned char) * 2) #define _SS_PAD2SIZE (_SS_MAXSIZE - sizeof(unsigned char) * 2 - \ _SS_PAD1SIZE - _SS_ALIGNSIZE) @@ -99,7 +99,7 @@ struct sockaddr_storage { unsigned short ss_family; #endif char __ss_pad1[_SS_PAD1SIZE]; - long long __ss_align; /* force desired structure storage alignment */ + double __ss_align; /* force desired structure storage alignment */ char __ss_pad2[_SS_PAD2SIZE]; }; #endif |