morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

shared: Make sure ip-protocol-xxx.h headers include <netinet/in.h>

Browse Source 
These headers use macros from <netinet/in.h> so let's make sure they
include the header.
This commit is contained in:
Daan De Meyer
2025-04-30 21:48:39 +02:00
parent 228e93c5c5
commit 95f87834f5
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/meson.build
View File

@@ -279,7 +279,7 @@ gperf_file = custom_target(
fname,
input : ip_protocol_list_txt,
output : fname,
command : [generate_gperfs, 'ip_protocol', 'IPPROTO_', '@INPUT@'],
command : [generate_gperfs, 'ip_protocol', 'IPPROTO_', '@INPUT@', '<netinet/in.h>'],
capture : true)
fname = 'ip-protocol-from-name.h'

21
tools/generate-gperfs.py
View File

@@ -9,18 +9,23 @@ Generate %-from-name.gperf from %-list.txt
import sys
if __name__ == '__main__':
if len(sys.argv) != 4:
sys.exit(f'Usage: {sys.argv[0]} name prefix file')
if len(sys.argv) < 4:
sys.exit(f'Usage: {sys.argv[0]} name prefix file [includes...]')
name, prefix, file = sys.argv[1:]
name, prefix, file, *includes = sys.argv[1:]
includes = [f"#include {i}" for i in includes]
print("""\
%{
_Pragma("GCC diagnostic ignored \\"-Wimplicit-fallthrough\\"")
# Older versions of python don't allow backslashes
# in f-strings so use chr(10) for newlines and chr(92)
# for backslashes instead as a workaround.
print(f"""\
%{{
_Pragma("GCC diagnostic ignored {chr(92)}"-Wimplicit-fallthrough{chr(92)}"")
#if __GNUC__ >= 15
_Pragma("GCC diagnostic ignored \\"-Wzero-as-null-pointer-constant\\"")
_Pragma("GCC diagnostic ignored {chr(92)}"-Wzero-as-null-pointer-constant{chr(92)}"")
#endif
%}""")
{chr(10).join(includes)}
%}}""")
print(f"""\
struct {name}_name {{ const char* name; int id; }};
%null-strings