diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-02-17 07:11:22 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-02-17 07:11:22 +0000 |
| commit | e83d532ff8b7d3c6eeaee3931d8b00df19c5f538 (patch) | |
| tree | a2c90999001ebcb8fd2fd67ffb3d5911a8e98f81 /ext/socket | |
| parent | 154193050b7878e290f9f166279c18e01ef44ad6 (diff) | |
| download | ruby-e83d532ff8b7d3c6eeaee3931d8b00df19c5f538.tar.gz ruby-e83d532ff8b7d3c6eeaee3931d8b00df19c5f538.tar.xz ruby-e83d532ff8b7d3c6eeaee3931d8b00df19c5f538.zip | |
2000-02-17
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -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 d99ad1250..0b9d9b6af 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 2fbb8d803..60bd71bac 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 0a61160e9..e7d2300b1 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 |