Merge branch 'include-guards' into 'master'
disamiguate include guards for arpa_inet and sys_time See merge request redox-os/relibc!1276
This commit is contained in:
@@ -11,10 +11,10 @@
|
||||
# - including netinet/in.h in arpa/inet.h
|
||||
# - splitting out functions (htonl, htons, ntohl, ntohs) into bits/arpainet.h
|
||||
#
|
||||
# netinet/in.h brings in sys/types.h which brings in features.h (needed for #[deprecated] annotation)
|
||||
# features.h needed for #[deprecated] annotation
|
||||
# bits/arpainet.h brings in inttypes.h
|
||||
sys_includes = ["netinet/in.h"]
|
||||
include_guard = "_ARPA_INET_H"
|
||||
sys_includes = ["features.h", "netinet/in.h"]
|
||||
include_guard = "_RELIBC_ARPA_INET_H"
|
||||
after_includes = """
|
||||
#include <bits/arpainet.h> // for htonl, htons, ntohl, ntohs
|
||||
#include <bits/socklen-t.h> // for socklen_t
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# sys/types.h brings in features.h (needed for #[deprecated] annotations)
|
||||
sys_includes = ["sys/types.h", "sys/select.h"]
|
||||
include_guard = "_SYS_TIME_H"
|
||||
# features.h needed for #[deprecated] annotations
|
||||
sys_includes = ["features.h", "sys/types.h", "sys/select.h"]
|
||||
include_guard = "_RELIBC_SYS_TIME_H"
|
||||
language = "C"
|
||||
after_includes = """
|
||||
#include <bits/timespec.h> // for timespec
|
||||
|
||||
Reference in New Issue
Block a user