Module Name: src
Committed By: christos
Date: Tue Feb 11 17:43:46 UTC 2025
Modified Files:
src/external/bsd/blocklist/port: port.h
Log Message:
More macros for portability (Hans Rosenfeld)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/blocklist/port/port.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/blocklist/port/port.h
diff -u src/external/bsd/blocklist/port/port.h:1.1.1.1 src/external/bsd/blocklist/port/port.h:1.2
--- src/external/bsd/blocklist/port/port.h:1.1.1.1 Sun Jun 14 21:52:54 2020
+++ src/external/bsd/blocklist/port/port.h Tue Feb 11 12:43:46 2025
@@ -15,6 +15,22 @@
#define __dead __attribute__((__noreturn__))
#endif
+#ifndef __BEGIN_DECLS
+#define __BEGIN_DECLS
+#endif
+
+#ifndef __END_DECLS
+#define __END_DECLS
+#endif
+
+#ifndef MIN
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef MAX
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+
#ifndef __RCSID
#define __RCSID(a)
#endif
@@ -27,6 +43,10 @@
#define __arraycount(a) (sizeof(a) / sizeof(a[0]))
#endif
+#ifndef __STRING
+#define __STRING(x) #x
+#endif
+
#ifndef HAVE_STRLCPY
size_t strlcpy(char *, const char *, size_t);
#endif
@@ -78,9 +98,10 @@ int clock_gettime(int, struct timespec *
#define CLOCK_REALTIME 0
#endif
-#if !defined(__FreeBSD__)
-#define _PATH_BLCONF "conf"
-#define _PATH_BLCONTROL "control"
-#define _PATH_BLSOCK "blocklistd.sock"
-#define _PATH_BLSTATE "blocklistd.db"
+#ifndef HAVE_VSYSLOG_R
+#define SYSLOG_DATA_INIT { 0 }
+struct syslog_data {
+ int dummy;
+};
+void vsyslog_r(int, struct syslog_data *, const char *, va_list);
#endif
