Skip to content

Commit 32cdffc

Browse files
tklausergopherbot
authored andcommitted
unix: don't redefine constants already defined in glibc headers
These are all present in glibc 2.37 which is currently used to generate these constants. Change-Id: I3ffbd8f8581e85e8854222ad3f2c7f44aac106c7 Reviewed-on: https://go-review.googlesource.com/c/sys/+/552417 Reviewed-by: David Chase <[email protected]> Auto-Submit: Tobias Klauser <[email protected]> Reviewed-by: Matt Layher <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Than McIntosh <[email protected]>
1 parent f0c7190 commit 32cdffc

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

unix/mkerrors.sh

-17
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,6 @@ struct ltchars {
284284
#include <asm/termbits.h>
285285
#endif
286286
287-
#ifndef MSG_FASTOPEN
288-
#define MSG_FASTOPEN 0x20000000
289-
#endif
290-
291287
#ifndef PTRACE_GETREGS
292288
#define PTRACE_GETREGS 0xc
293289
#endif
@@ -296,14 +292,6 @@ struct ltchars {
296292
#define PTRACE_SETREGS 0xd
297293
#endif
298294
299-
#ifndef SOL_NETLINK
300-
#define SOL_NETLINK 270
301-
#endif
302-
303-
#ifndef SOL_SMC
304-
#define SOL_SMC 286
305-
#endif
306-
307295
#ifdef SOL_BLUETOOTH
308296
// SPARC includes this in /usr/include/sparc64-linux-gnu/bits/socket.h
309297
// but it is already in bluetooth_linux.go
@@ -320,11 +308,6 @@ struct ltchars {
320308
#undef TIPC_WAIT_FOREVER
321309
#define TIPC_WAIT_FOREVER 0xffffffff
322310
323-
// Copied from linux/l2tp.h
324-
// Including linux/l2tp.h here causes conflicts between linux/in.h
325-
// and netinet/in.h included via net/route.h above.
326-
#define IPPROTO_L2TP 115
327-
328311
// Copied from linux/netfilter/nf_nat.h
329312
// Including linux/netfilter/nf_nat.h here causes conflicts between linux/in.h
330313
// and netinet/in.h.

0 commit comments

Comments
 (0)