- fix conflicting decls of syslog related facilitynames and prioritynames tables

This commit is contained in:
Bernhard Reutner-Fischer 2008-01-27 12:50:12 +00:00
parent 61160dd0a1
commit f470196a41
17 changed files with 42 additions and 51 deletions

View File

@ -10,9 +10,9 @@
*/
#include "libbb.h"
#include <syslog.h>
#include <paths.h>
#include <sys/reboot.h>
#include <sys/syslog.h>
#define INIT_BUFFS_SIZE 256
#define CONSOLE_NAME_SIZE 32

View File

@ -7,8 +7,8 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include <syslog.h>
#include "libbb.h"
#include <syslog.h>
void bb_info_msg(const char *s, ...)
{

View File

@ -7,8 +7,8 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include <syslog.h>
#include "libbb.h"
#include <syslog.h>
smallint logmode = LOGMODE_STDIO;
const char *msg_eol = "\n";

View File

@ -4,9 +4,9 @@
*/
#include "libbb.h"
#include <syslog.h>
#include <utmp.h>
#include <sys/resource.h>
#include <syslog.h>
#if ENABLE_SELINUX
#include <selinux/selinux.h> /* for is_selinux_enabled() */

View File

@ -6,7 +6,6 @@
#include "libbb.h"
#include <syslog.h>
static void nuke_str(char *str)
{
if (str) memset(str, 0, strlen(str));

View File

@ -5,9 +5,8 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include <syslog.h>
#include "libbb.h"
#include <syslog.h>
//static void catchalarm(int ATTRIBUTE_UNUSED junk)
//{

View File

@ -11,8 +11,8 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
#include <sys/syslog.h>
#include "libbb.h"
#include <syslog.h>
#ifndef CRONTABS
#define CRONTABS "/var/spool/cron/crontabs"

View File

@ -53,17 +53,12 @@
The postal address is:
Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia.
*/
//#include <sys/wait.h>
//#include <sys/ioctl.h>
//#include <sys/socket.h>
#include <sys/un.h>
#include <dirent.h>
#include <syslog.h>
#include <sys/sysmacros.h>
#include "libbb.h"
#include "xregex.h"
#include <syslog.h>
#include <sys/un.h>
#include <sys/sysmacros.h>
/* Various defines taken from linux/major.h */
#define IDE0_MAJOR 3

View File

@ -17,8 +17,8 @@
* the first porting of oao' scdns to busybox also.
*/
#include <syslog.h>
#include "libbb.h"
#include <syslog.h>
//#define DEBUG 1
#define DEBUG 0

View File

@ -7,8 +7,8 @@
* Licensed under GPL version 2, see file LICENSE in this tarball for details.
*/
#include <syslog.h>
#include "libbb.h"
#include <syslog.h>
#include "isrv.h"
enum { TIMEOUT = 20 };

View File

@ -16,7 +16,6 @@
* initially integrated into busybox by Bernhard Fischer
*/
#include <syslog.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <arpa/inet.h>

View File

@ -24,14 +24,13 @@
#define DEBUG 0
#include "libbb.h"
#include <syslog.h>
#if DEBUG
#define TELCMDS
#define TELOPTS
#endif
#include <arpa/telnet.h>
#include <sys/syslog.h>
/* Structure that describes a session */
struct tsession {

View File

@ -23,9 +23,6 @@
// - avoid silent script failures, especially under load...
// - link status monitoring (restart on link-up; stop on link-down)
#include <syslog.h>
#include <poll.h>
#include <sys/wait.h>
#include <netinet/ether.h>
#include <net/ethernet.h>
#include <net/if.h>
@ -34,6 +31,7 @@
#include <linux/sockios.h>
#include "libbb.h"
#include <syslog.h>
/* We don't need more than 32 bits of the counter */
#define MONOTONIC_US() ((unsigned)monotonic_us())

View File

@ -18,7 +18,7 @@
*/
#include "libbb.h"
#include <sys/syslog.h>
#include <syslog.h>
#include <sys/klog.h>
static void klogd_signal(int sig ATTRIBUTE_UNUSED)

View File

@ -8,27 +8,31 @@
*/
#include "libbb.h"
#if !defined CONFIG_SYSLOGD
/* SYSLOG_NAMES defined to pull prioritynames[] and facilitynames[]
* from syslog.h. Grrrr - glibc puts those in _rwdata_! :( */
#ifndef CONFIG_SYSLOGD
#define SYSLOG_NAMES
#define SYSLOG_NAMES_CONST /* uclibc is saner :) */
#include <sys/syslog.h>
#define SYSLOG_NAMES_CONST
#include <syslog.h>
#else
#include <sys/syslog.h>
# ifndef __dietlibc__
/* We have to do this since the header file defines static
* structures. Argh.... bad libc, bad, bad...
/* brokenness alert. Everybody except dietlibc get's this wrong by neither
* providing a typedef nor an extern for facilitynames and prioritynames
* in syslog.h.
*/
typedef struct _code {
char *c_name;
# include <syslog.h>
# ifndef __dietlibc__
/* We have to do this since the header file does neither provide a sane type
* for this structure nor extern definitions. Argh.... bad libc, bad, bad...
*/
typedef struct _code {
char *c_name; /* FIXME: this should be const char *const c_name ! */
int c_val;
} CODE;
extern CODE prioritynames[];
extern CODE facilitynames[];
} CODE;
# ifdef __UCLIBC__
extern const CODE prioritynames[];
extern const CODE facilitynames[];
# else
extern CODE prioritynames[];
extern CODE facilitynames[];
# endif
# endif
#endif

View File

@ -14,14 +14,12 @@
*/
#include "libbb.h"
#define SYSLOG_NAMES
#define SYSLOG_NAMES_CONST
#include <syslog.h>
#include <paths.h>
#include <sys/un.h>
/* SYSLOG_NAMES defined to pull prioritynames[] and facilitynames[]
* from syslog.h. Grrrr - glibc puts those in _rwdata_! :( */
#define SYSLOG_NAMES
#define SYSLOG_NAMES_CONST /* uclibc is saner :) */
#include <sys/syslog.h>
#include <sys/uio.h>
#if ENABLE_FEATURE_REMOTE_LOG

View File

@ -20,9 +20,9 @@
#include <mntent.h>
#include "libbb.h"
#include <syslog.h>
/* Needed for nfs support only... */
#include <syslog.h>
#include <sys/utsname.h>
#undef TRUE
#undef FALSE