emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix conflicting decls of syslog related facilitynames and prioritynames tables

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

42
sysklogd/logger.c
View File

@@ -8,28 +8,32 @@
*/
#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...
*/
typedef struct _code {
char *c_name;
int c_val;
} CODE;
extern CODE prioritynames[];
extern CODE facilitynames[];
/* brokenness alert. Everybody except dietlibc get's this wrong by neither
* providing a typedef nor an extern for facilitynames and prioritynames
* in syslog.h.
*/
# 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;
# ifdef __UCLIBC__
extern const CODE prioritynames[];
extern const CODE facilitynames[];
# else
extern CODE prioritynames[];
extern CODE facilitynames[];
# endif
# endif
#endif
/* Decode a symbolic name to a numeric value