ports/netcat/nacl.patch - Issue 162913002: Use _NEWLIB_VERSION macro to detect newlib.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ports/netcat/nacl.patch

Issue 162913002: Use _NEWLIB_VERSION macro to detect newlib. (Closed) Base URL: https://naclports.googlecode.com/svn/trunk/src

Patch Set: Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 diff --git a/src/Makefile.in b/src/Makefile.in	1 diff --git a/src/Makefile.in b/src/Makefile.in

2 index cf822d4..01d6e4f 100644	2 index cf822d4..01d6e4f 100644

3 --- a/src/Makefile.in	3 --- a/src/Makefile.in

4 +++ b/src/Makefile.in	4 +++ b/src/Makefile.in

5 @@ -161,6 +161,7 @@ netcat_SOURCES = \	5 @@ -161,6 +161,7 @@ netcat_SOURCES = \

6	6

7	7

8 netcat_LDADD = @CONTRIBLIBS@ @INTLLIBS@	8 netcat_LDADD = @CONTRIBLIBS@ @INTLLIBS@

9 +netcat_PPAPI = -lppapi_simple -lnacl_io -lppapi -lppapi_cpp	9 +netcat_PPAPI = -lppapi_simple -lnacl_io -lppapi -lppapi_cpp

10	10

(...skipping 87 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
98 +#if !defined(__native_client__) \|\| defined(__GLIBC__)	98 +#if !defined(__native_client__) \|\| defined(__GLIBC__)

99 +# include <net/if.h>	99 +# include <net/if.h>

100 +#endif	100 +#endif

101 #ifdef HAVE_SYS_SOCKIO_H	101 #ifdef HAVE_SYS_SOCKIO_H

102 #include <sys/sockio.h>	102 #include <sys/sockio.h>

103 #endif	103 #endif

104 @@ -109,6 +111,13 @@ int udphelper_ancillary_read(struct msghdr *my_hdr,	104 @@ -109,6 +111,13 @@ int udphelper_ancillary_read(struct msghdr *my_hdr,

105	105

106 int udphelper_sockets_open(int **sockbuf, in_port_t nport)	106 int udphelper_sockets_open(int **sockbuf, in_port_t nport)

107 {	107 {

108 +#if defined(__native_client__) && !defined(__GLIBC__)	108 +#if defined(__native_client__) && defined(_NEWLIB_VERSION)

109 + /*	109 + /*

110 + * TODO(bradnelson): figure out if nacl_io can support these calls.	110 + * TODO(bradnelson): figure out if nacl_io can support these calls.

111 + */	111 + */

112 + errno = ENOSYS;	112 + errno = ENOSYS;

113 + return -1;	113 + return -1;

114 +#else	114 +#else

115 int ret, i, alloc_size, dummy_sock, if_total = 1;	115 int ret, i, alloc_size, dummy_sock, if_total = 1;

116 int *my_sockbuf = NULL, my_sockbuf_max = 0, sock_total = 0;	116 int *my_sockbuf = NULL, my_sockbuf_max = 0, sock_total = 0;

117 unsigned int if_pos = 0;	117 unsigned int if_pos = 0;

118 @@ -279,6 +288,7 @@ int udphelper_sockets_open(int **sockbuf, in_port_t nport)	118 @@ -279,6 +288,7 @@ int udphelper_sockets_open(int **sockbuf, in_port_t nport)

119 errno = ret;	119 errno = ret;

120	120

121 return -1;	121 return -1;

122 +#endif	122 +#endif

123 }	123 }

124	124

125 #endif /* USE_PKTINFO */	125 #endif /* USE_PKTINFO */

OLD	NEW

« no previous file with comments | « ports/libtar/nacl.patch ('k') | no next file » | no next file with comments »