Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/watchdog/files: watchdog-5.6-headers.patch
Date: Sun, 22 Mar 2009 22:12:36
Message-Id: E1LlVuE-0005oz-BH@stork.gentoo.org
1 vapier 09/03/22 22:12:34
2
3 Added: watchdog-5.6-headers.patch
4 Log:
5 Version bump.
6 (Portage version: 2.2_rc26/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 sys-apps/watchdog/files/watchdog-5.6-headers.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/watchdog/files/watchdog-5.6-headers.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/watchdog/files/watchdog-5.6-headers.patch?rev=1.1&content-type=text/plain
13
14 Index: watchdog-5.6-headers.patch
15 ===================================================================
16 http://sourceforge.net/tracker/index.php?func=detail&aid=1791328&group_id=172030&atid=860196
17
18 pull in more headers for prototypes
19
20 --- watchdog-5.6/src/fstab.c
21 +++ watchdog-5.6/src/fstab.c
22 @@ -4,6 +4,7 @@
23 #include "config.h"
24 #endif
25
26 +#define _GNU_SOURCE /* for strsignal() */
27 #include <unistd.h>
28 #include <errno.h>
29 #include <stdio.h>
30 --- watchdog-5.6/src/wd_keepalive.c
31 +++ watchdog-5.6/src/wd_keepalive.c
32 @@ -24,7 +25,7 @@
33 #include <stdlib.h>
34 #include <sys/mman.h>
35 #include <sys/wait.h>
36 -#define __USE_GNU
37 +#include <libgen.h>
38 #include <string.h>
39 #include <syslog.h>
40
41 --- watchdog-5.6/src/watchdog.c
42 +++ watchdog-5.6/src/watchdog.c
43 @@ -26,12 +26,10 @@
44 #include <sys/stat.h>
45 #include <sys/types.h>
46 #include <linux/watchdog.h>
47 -#define __USE_GNU
48 #include <string.h>
49
50 -#if !defined(__GLIBC__) /* __GLIBC__ */
51 -extern char *basename(const char *);
52 -#endif /* __GLIBC__ */
53 +#include <sys/ioctl.h>
54 +#include <libgen.h>
55
56 #include <unistd.h>