From: maximilian attems <max@stro.at>
Date: Thu, 24 Jul 2008 11:44:44 +0000 (+0200)
Subject: dmesg: nuke old glibc 5 support
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5423ccb1a1306fb615ce790a635c8a291dedd170;p=util-linux

dmesg: nuke old glibc 5 support

dmesg.c:42: error: expected declaration specifiers or ‘...’ before ‘klogctl’
dmesg.c:42: error: expected declaration specifiers or ‘...’ before ‘type’
dmesg.c:42: error: expected declaration specifiers or ‘...’ before ‘b’
dmesg.c:42: error: expected declaration specifiers or ‘...’ before ‘len’

without belows compat section dmesg just compiles fine against klibc.
as bonus reorder the includes.

Signed-off-by: maximilian attems <max@stro.at>
---

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index d7adc0ae..ac0535d7 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -33,20 +33,9 @@
 #include <stdio.h>
 #include <getopt.h>
 #include <stdlib.h>
-#include "nls.h"
-
-#if __GNU_LIBRARY__ < 5
-
-#ifndef __alpha__
-# define __NR_klogctl __NR_syslog
-  static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
-#else /* __alpha__ */
-#define klogctl syslog
-#endif
-
-#else
 # include <sys/klog.h>
-#endif
+
+#include "nls.h"
 
 static char *progname;