Skip to content

Commit 16cd668

Browse files
anxkhaanxkha
committed
Making it closer to building properly.
svn path=/branches/nslookup/; revision=43828
1 parent f95a2ee commit 16cd668

File tree

12 files changed

+123
-14
lines changed

12 files changed

+123
-14
lines changed

‎dll/3rdparty/3rdparty.rbuild

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<directory name="isc">
55
<xi:include href="isc/isc.rbuild" />
66
</directory>
7-
<directory name="dns">
8-
<xi:include href="dns/dns.rbuild" />
9-
</directory>
107
<directory name="mesa32">
118
<xi:include href="mesa32/mesa32.rbuild" />
129
</directory>

‎dll/3rdparty/bind9/bind9.rbuild

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
3+
<module name="bind9" type="win32dll" installbase="system32" installname="libbind9.dll" allowwarnings="true">
4+
<include base="ReactOS">dll/3rdparty/isc/include</include>
5+
<include base="ReactOS">dll/3rdparty/isc/win32</include>
6+
<include base="ReactOS">dll/3rdparty/isc/win32/include</include>
7+
<include base="ReactOS">dll/3rdparty/isc/noatomic/include</include>
8+
<include base="ReactOS">dll/3rdparty/dns/include</include>
9+
<include base="ReactOS">dll/3rdparty/isccfg/include</include>
10+
<include base="ReactOS">dll/3rdparty/bind9/include</include>
11+
<include base="ReactOS">dll/3rdparty/bind9/win32/include</include>
12+
<define name="WIN32" />
13+
<define name="USE_MD5" />
14+
<define name="LIBBIND9_EXPORTS" />
15+
<define name="ISC_PLATFORM_HAVEIN6PKTINFO" />
16+
<define name="ISC_PLATFORM_USEGCCASM" />
17+
<file>check.c</file>
18+
<file>getaddresses.c</file>
19+
<directory name="win32">
20+
<file>DLLMain.c</file>
21+
<file>version.c</file>
22+
</directory>
23+
</module>

‎dll/3rdparty/dns/dns.rbuild

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
33
<module name="dns" type="win32dll" installbase="system32" installname="libdns.dll" allowwarnings="true">
44
<include base="ReactOS">dll/3rdparty/dns/include</include>
5+
<include base="ReactOS">dll/3rdparty/dns/win32/include</include>
56
<include base="ReactOS">dll/3rdparty/isc/include</include>
7+
<include base="ReactOS">dll/3rdparty/isc/win32</include>
68
<include base="ReactOS">dll/3rdparty/isc/win32/include</include>
7-
<include base="ReactOS">dll/3rdparty/isc/x86_32/include</include>
9+
<include base="ReactOS">dll/3rdparty/isc/noatomic/include</include>
810
<define name="WIN32" />
911
<define name="USE_MD5" />
1012
<define name="LIBDNS_EXPORTS" />

‎dll/3rdparty/isc/include/config.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@
5656
* Windows NT and 2K only
5757
*/
5858
#ifndef __REACTOS__
59-
#define _WIN32_WINNT 0x0400
59+
#define _WIN32_WINNT 0x0520
6060
#endif
61+
6162
/* Define if you have the ANSI C header files. */
6263
#define STDC_HEADERS 1
6364

‎dll/3rdparty/isc/include/isc/log.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424

2525
#include <stdio.h>
2626
#include <stdarg.h>
27-
28-
#ifndef __REACTOS__
2927
#include <syslog.h> /* XXXDCL NT */
30-
#endif
3128

3229
#include <isc/formatcheck.h>
3330
#include <isc/lang.h>

‎dll/3rdparty/isc/include/versions.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,22 @@
3636
#define LIBAGE 2
3737
#endif /* LIBDNS_EXPORTS */
3838

39+
#ifdef LIBLWRES_EXPORTS
40+
#define LIBINTERFACE 50
41+
#define LIBREVISION 2
42+
#define LIBAGE 0
43+
#endif /* LIBLWRES_EXPORTS */
44+
45+
#ifdef LIBBIND9_EXPORTS
46+
#define LIBINTERFACE 50
47+
#define LIBREVISION 3
48+
#define LIBAGE 0
49+
#endif /* LIBBIND9_EXPORTS */
50+
51+
#ifdef LIBISCCFG_EXPORTS
52+
#define LIBINTERFACE 50
53+
#define LIBREVISION 0
54+
#define LIBAGE 0
55+
#endif /* LIBISCCFG_EXPORTS */
56+
3957
#endif /* VERSIONS_H */

‎dll/3rdparty/isc/isc.rbuild

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
33
<module name="isc" type="win32dll" installbase="system32" installname="libisc.dll" allowwarnings="true">
44
<include base="ReactOS">dll/3rdparty/isc/include</include>
5+
<include base="ReactOS">dll/3rdparty/isc/win32</include>
56
<include base="ReactOS">dll/3rdparty/isc/win32/include</include>
6-
<include base="ReactOS">dll/3rdparty/isc/x86_32/include</include>
7+
<include base="ReactOS">dll/3rdparty/isc/noatomic/include</include>
8+
<include base="ReactOS">dll/3rdparty/isccfg/include</include>
79
<define name="WIN32" />
8-
<define name="USE_MD5" />
910
<define name="LIBISC_EXPORTS" />
10-
<define name="ISC_PLATFORM_HAVEIN6PKTINFO" />
11-
<define name="ISC_PLATFORM_USEGCCASM" />
1211
<file>assertions.c</file>
1312
<file>base32.c</file>
1413
<file>base64.c</file>
@@ -32,6 +31,7 @@
3231
<file>lex.c</file>
3332
<file>lfsr.c</file>
3433
<file>lib.c</file>
34+
<file>log.c</file>
3535
<file>md5.c</file>
3636
<file>mem.c</file>
3737
<file>mutexblock.c</file>
@@ -75,7 +75,6 @@
7575
<file>ipv6.c</file>
7676
<file>keyboard.c</file>
7777
<file>net.c</file>
78-
<file>ntgroups.c</file>
7978
<file>ntpaths.c</file>
8079
<file>once.c</file>
8180
<file>os.c</file>

‎dll/3rdparty/isc/win32/include/isc/platform.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
*** Network.
3131
***/
3232

33+
#ifndef __REACTOS__
3334
#define ISC_PLATFORM_HAVEIPV6
35+
#endif
36+
3437
#if _MSC_VER > 1200
3538
#define ISC_PLATFORM_HAVEIN6PKTINFO
3639
#endif

‎dll/3rdparty/isc/win32/net.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ try_ipv6only(void) {
197197
ipv6only_result = ISC_R_SUCCESS;
198198

199199
close:
200-
closeocket(s);
200+
closesocket(s);
201201
return;
202202
#endif /* IPV6_V6ONLY */
203203
}

‎dll/3rdparty/isccfg/isccfg.rbuild

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
3+
<module name="isccfg" type="win32dll" installbase="system32" installname="libisccfg.dll" allowwarnings="true">
4+
<include base="ReactOS">dll/3rdparty/isc/include</include>
5+
<include base="ReactOS">dll/3rdparty/isc/win32</include>
6+
<include base="ReactOS">dll/3rdparty/isc/win32/include</include>
7+
<include base="ReactOS">dll/3rdparty/isc/noatomic/include</include>
8+
<include base="ReactOS">dll/3rdparty/dns/include</include>
9+
<include base="ReactOS">dll/3rdparty/dns/win32/include</include>
10+
<include base="ReactOS">dll/3rdparty/dns/sec/openssl/include</include>
11+
<include base="ReactOS">dll/3rdparty/isccfg/include</include>
12+
<include base="ReactOS">dll/3rdparty/isccfg/win32/include</include>
13+
<define name="WIN32" />
14+
<define name="USE_MD5" />
15+
<define name="LIBISCCFG_EXPORTS" />
16+
<define name="ISC_PLATFORM_HAVEIN6PKTINFO" />
17+
<define name="ISC_PLATFORM_USEGCCASM" />
18+
<file>aclconf.c</file>
19+
<file>log.c</file>
20+
<file>namedconf.c</file>
21+
<file>parser.c</file>
22+
<directory name="win32">
23+
<file>DLLMain.c</file>
24+
<file>version.c</file>
25+
</directory>
26+
</module>

‎dll/3rdparty/lwres/lwres.rbuild

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<module name="lwres" type="win32dll" installbase="system32" installname="liblwres.dll" allowwarnings="true">
2+
<include base="ReactOS">dll/3rdparty/isc/include</include>
3+
<include base="ReactOS">dll/3rdparty/isc/win32</include>
4+
<include base="ReactOS">dll/3rdparty/isc/win32/include</include>
5+
<include base="ReactOS">dll/3rdparty/isc/noatomic/include</include>
6+
<include base="ReactOS">dll/3rdparty/lwres/win32/include/lwres</include>
7+
<include base="ReactOS">dll/3rdparty/lwres/include</include>
8+
<include base="ReactOS">dll/3rdparty/lwres/win32/include</include>
9+
<include base="ReactOS">dll/3rdparty/dns/include</include>
10+
<include base="ReactOS">dll/3rdparty/dns/win32/include</include>
11+
<include base="ReactOS">dll/3rdparty/dns/sec/openssl/include</include>
12+
<define name="WIN32" />
13+
<define name="USE_MD5" />
14+
<define name="LIBLWRES_EXPORTS" />
15+
<define name="ISC_PLATFORM_HAVEIN6PKTINFO" />
16+
<define name="ISC_PLATFORM_USEGCCASM" />
17+
<file>context.c</file>
18+
<file>gai_strerror.c</file>
19+
<file>getaddrinfo.c</file>
20+
<file>gethost.c</file>
21+
<file>getipnode.c</file>
22+
<file>getnameinfo.c</file>
23+
<file>getrrset.c</file>
24+
<file>herror.c</file>
25+
<file>lwbuffer.c</file>
26+
<file>lwinetaton.c</file>
27+
<file>lwinetntop.c</file>
28+
<file>lwinetpton.c</file>
29+
<file>lwpacket.c</file>
30+
<file>lwres_gabn.c</file>
31+
<file>lwres_gnba.c</file>
32+
<file>lwres_grbn.c</file>
33+
<file>lwres_noop.c</file>
34+
<file>lwresutil.c</file>
35+
<directory name="win32">
36+
<file>lwconfig.c</file>
37+
<file>DLLMain.c</file>
38+
<file>version.c</file>
39+
<file>socket.c</file>
40+
</directory>
41+
</module>

‎dll/3rdparty/lwres/win32/include/lwres/netdb.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
/*
3232
* Define if <netdb.h> does not declare struct addrinfo.
3333
*/
34+
#ifndef __REACTOS__
3435
#define ISC_LWRES_NEEDADDRINFO 1
36+
#endif
3537

3638
#ifdef ISC_LWRES_NEEDADDRINFO
3739
struct addrinfo {

0 commit comments

Comments
 (0)