aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoredwin <edwin@FreeBSD.org>2003-01-23 19:37:10 +0800
committeredwin <edwin@FreeBSD.org>2003-01-23 19:37:10 +0800
commit4a7f059f10bb64130af0b953648bf8729b47130b (patch)
tree57e6d51de54b0eae74ad5945dba03385181acce0 /net
parent3e9b8df1f6da3a6a38a771b59e4f520dd9efbdfc (diff)
downloadfreebsd-ports-gnome-4a7f059f10bb64130af0b953648bf8729b47130b.tar.gz
freebsd-ports-gnome-4a7f059f10bb64130af0b953648bf8729b47130b.tar.zst
freebsd-ports-gnome-4a7f059f10bb64130af0b953648bf8729b47130b.zip
Make it at least compiling on -current again.
Still talking to Volker Stolz <stolz@i2.informatik.rwth-aachen.de> for the -STABLE version.
Diffstat (limited to 'net')
-rw-r--r--net/cap/files/patch-lib-cap-ablog.c34
1 files changed, 31 insertions, 3 deletions
diff --git a/net/cap/files/patch-lib-cap-ablog.c b/net/cap/files/patch-lib-cap-ablog.c
index 88c1db654032..7a794fb79d67 100644
--- a/net/cap/files/patch-lib-cap-ablog.c
+++ b/net/cap/files/patch-lib-cap-ablog.c
@@ -1,6 +1,25 @@
---- lib/cap/ablog.c.foo Mon Nov 4 16:43:02 2002
-+++ lib/cap/ablog.c Mon Nov 4 16:43:11 2002
-@@ -91,7 +91,7 @@
+--- lib/cap/ablog.c.orig Thu Jan 23 01:45:08 2003
++++ lib/cap/ablog.c Thu Jan 23 03:14:28 2003
+@@ -66,8 +66,17 @@
+ * This is something all machine should, but don't have :-)
+ */
+
+-static FILE *lfp = stderr;
++#define GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
+
++#if GCC_VERSION <= 30200
++static FILE *lfp = stderr;
++#else
++static FILE *lfp;
++static void lfp_construct (void) __attribute__((constructor));
++static void lfp_construct (void) { lfp = stderr; }
++#endif
+
+ #ifndef USEVPRINTF
+ /* Bletch - gotta do it because pyramids don't work the other way */
+@@ -91,7 +100,7 @@
#endif USEVPRINTF
int saveerr;
extern int errno;
@@ -9,3 +28,12 @@
#ifndef __FreeBSD__
extern char *sys_errlist[];
#endif
+@@ -164,7 +173,7 @@
+ static char *
+ mytod()
+ {
+- long tloc;
++ time_t tloc;
+ struct tm *tm, *localtime();
+ static char buf[100]; /* should be large enough */
+