Fix RTEMS ifdef labelling.

This commit is contained in:
Chris Johns 2015-06-19 15:32:13 +10:00
parent 54409c7f6e
commit c31922b8c4
2 changed files with 12 additions and 12 deletions

View File

@ -433,11 +433,11 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
const char *buf, int optimize, bpf_u_int32 mask) const char *buf, int optimize, bpf_u_int32 mask)
#endif /* WIN32 */ #endif /* WIN32 */
{ {
#if __rtems__ #ifdef __rtems__
int n_errors; int n_errors;
#else #else
extern int n_errors; extern int n_errors;
#endif #endif /* __rtems__ */
const char * volatile xbuf = buf; const char * volatile xbuf = buf;
u_int len; u_int len;

View File

@ -39,6 +39,14 @@ static const char rcsid[] _U_ =
/* $FreeBSD$ */ /* $FreeBSD$ */
#ifdef __rtems__
#define __need_getopt_newlib
#include <getopt.h>
#define setpriority(a, b, c)
#include <machine/rtems-bsd-program.h>
#include <machine/rtems-bsd-commands.h>
#endif /* __rtems__ */
/* /*
* tcpdump - monitor tcp/ip traffic on an ethernet. * tcpdump - monitor tcp/ip traffic on an ethernet.
* *
@ -51,14 +59,6 @@ static const char rcsid[] _U_ =
#include "config.h" #include "config.h"
#endif #endif
#if __rtems__
#define __need_getopt_newlib
#include <getopt.h>
#define setpriority(a, b, c)
#include <machine/rtems-bsd-program.h>
#include <machine/rtems-bsd-commands.h>
#endif
#include <tcpdump-stdinc.h> #include <tcpdump-stdinc.h>
#ifdef WIN32 #ifdef WIN32
@ -2120,11 +2120,11 @@ static void verbose_stats_dump(int sig _U_)
static void static void
usage(void) usage(void)
{ {
#if __rtems__ #ifdef __rtems__
#define version "RTEMS Version" #define version "RTEMS Version"
#else #else
extern char version[]; extern char version[];
#endif #endif /* __rtems__ */
#ifndef HAVE_PCAP_LIB_VERSION #ifndef HAVE_PCAP_LIB_VERSION
#if defined(WIN32) || defined(HAVE_PCAP_VERSION) #if defined(WIN32) || defined(HAVE_PCAP_VERSION)
extern char pcap_version[]; extern char pcap_version[];