[Git][NTPsec/ntpsec][master] squash NetBSD bug: can't find siginfo_t

[Hal Murray (@hal.murray)]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
c71a7539 by Hal Murray at 2024-06-22T03:08:19-07:00
squash NetBSD bug: can't find siginfo_t

- - - - -


2 changed files:

- include/ntp_stdlib.h
- libntp/syssignal.c


Changes:

=====================================
include/ntp_stdlib.h
=====================================
@@ -115,7 +115,9 @@ extern	const char *refid_str	(uint32_t, int);
 extern	int	decodenetnum	(const char *, sockaddr_u *);
 
 extern	void	signal_no_reset (int, void (*func)(int));
+#ifndef __NetBSD
 extern void signal_no_reset1(int, void (*func)(int, siginfo_t *, void *));
+#endif
 
 extern	void	getauthkeys 	(const char *);
 


=====================================
libntp/syssignal.c
=====================================
@@ -7,12 +7,6 @@
 #include "ntp_syslog.h"
 #include "ntp_stdlib.h"
 
-# ifdef SA_RESTART
-#  define Z_SA_RESTART		SA_RESTART
-# else
-#  define Z_SA_RESTART		0
-# endif
-
 /* set an sa_handler */
 void
 signal_no_reset(
@@ -34,6 +28,11 @@ signal_no_reset(
 	}
 }
 
+#ifndef __NetBSD
+/* NetBSD 10.0, May 2024, barfs when it can't find siginfo_t ???
+ * There is a similar test in include/ntp_stdlib.h
+ * This is only used by ntp_sandbox inside an ifdef for HAVE_SECCOMP_H */
+
 /* set an sa_sigaction */
 void
 signal_no_reset1(
@@ -55,3 +54,5 @@ signal_no_reset1(
 		exit(1);
 	}
 }
+#endif
+



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/c71a75394c0ffbe92455cd71cdaf01f9cdfd26ef

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/c71a75394c0ffbe92455cd71cdaf01f9cdfd26ef
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20240622/6fb4ba45/attachment-0001.htm>