Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitd862045

Browse files
committed
Don't use HAVE_STRUCT_ADDRINFO as a guide to whether netdb.h defines
macros like AI_NUMERICHOST; instead, test the macros individually.Should fix recent reports of trouble on AIX and Unixware.
1 parentd829560 commitd862045

File tree

1 file changed

+34
-16
lines changed

1 file changed

+34
-16
lines changed

‎src/include/getaddrinfo.h

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* Copyright (c) 2003, PostgreSQL Global Development Group
1717
*
18-
* $Id: getaddrinfo.h,v 1.8 2003/08/04 00:43:29 momjian Exp $
18+
* $Id: getaddrinfo.h,v 1.9 2003/08/07 16:45:21 tgl Exp $
1919
*
2020
*-------------------------------------------------------------------------
2121
*/
@@ -28,43 +28,60 @@
2828
#endif
2929

3030

31-
#ifndefHAVE_STRUCT_ADDRINFO
31+
/* Various macros that ought to be in <netdb.h>, but might not be */
3232

33-
structaddrinfo
34-
{
35-
intai_flags;
36-
intai_family;
37-
intai_socktype;
38-
intai_protocol;
39-
size_tai_addrlen;
40-
structsockaddr*ai_addr;
41-
char*ai_canonname;
42-
structaddrinfo*ai_next;
43-
};
33+
#ifndefEAI_FAIL
4434

45-
#defineEAI_BADFLAGS-1
35+
#defineEAI_BADFLAGS-1
4636
#defineEAI_NONAME-2
4737
#defineEAI_AGAIN-3
4838
#defineEAI_FAIL-4
4939
#defineEAI_FAMILY-6
50-
#defineEAI_SOCKTYPE-7
40+
#defineEAI_SOCKTYPE-7
5141
#defineEAI_SERVICE-8
5242
#defineEAI_MEMORY-10
5343
#defineEAI_SYSTEM-11
5444

45+
#endif
46+
47+
#ifndefAI_PASSIVE
5548
#defineAI_PASSIVE0x0001
49+
#endif
50+
#ifndefAI_NUMERICHOST
5651
#defineAI_NUMERICHOST0x0004
52+
#endif
5753

54+
#ifndefNI_NUMERICHOST
5855
#defineNI_NUMERICHOST1
56+
#endif
57+
#ifndefNI_NUMERICSERV
5958
#defineNI_NUMERICSERV2
60-
#endif/* HAVE_STRUCT_ADDRINFO */
59+
#endif
6160

6261
#ifndefNI_MAXHOST
6362
#defineNI_MAXHOST1025
63+
#endif
64+
#ifndefNI_MAXSERV
6465
#defineNI_MAXSERV32
6566
#endif
6667

6768

69+
#ifndefHAVE_STRUCT_ADDRINFO
70+
71+
structaddrinfo
72+
{
73+
intai_flags;
74+
intai_family;
75+
intai_socktype;
76+
intai_protocol;
77+
size_tai_addrlen;
78+
structsockaddr*ai_addr;
79+
char*ai_canonname;
80+
structaddrinfo*ai_next;
81+
};
82+
83+
#endif/* HAVE_STRUCT_ADDRINFO */
84+
6885

6986
#ifndefHAVE_GETADDRINFO
7087

@@ -96,6 +113,7 @@ extern const char *gai_strerror(int errcode);
96113
externintgetnameinfo(conststructsockaddr*sa,intsalen,
97114
char*node,intnodelen,
98115
char*service,intservicelen,intflags);
116+
99117
#endif/* HAVE_GETADDRINFO */
100118

101119
#endif/* GETADDRINFO_H */

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp