Bug#220232: Some more redefinitions
Hi,
some more redefinitions:
g++ -DP_LINUX -ffunction-sections -fdata-sections -D_REENTRANT -Wall -DP_USE_PRAGMA -g -D_DEBUG -DPMEMORY_CHECK=1 -DPHAS_TEMPLATES -I/usr/include/ptlib/unix -I/usr/include/pwlib -DPTRACING -I/home/mrvn/build/retry/openh323/openh323-1.12.2/include -DHAS_IXJ -DHAS_OSS -DPTRACING -I/usr/share/pwlib//include -DP_USE_PRAGMA -fPIC -DPIC -save-temps -O2 -x c++ -c h323.cxx -o /home/mrvn/build/retry/openh323/openh323-1.12.2/lib/obj_linux_m68k_d/h323.o
In file included from /usr/include/ptlib/unix/ptlib/socket.h:110,
from /usr/share/pwlib/include/ptlib/sockets.h:98,
from /home/mrvn/build/retry/openh323/openh323-1.12.2/include/rtp.h:200,
from /home/mrvn/build/retry/openh323/openh323-1.12.2/include/mediafmt.h:83,
from /home/mrvn/build/retry/openh323/openh323-1.12.2/include/codecs.h:266,
from /home/mrvn/build/retry/openh323/openh323-1.12.2/include/h323caps.h:169,
from /home/mrvn/build/retry/openh323/openh323-1.12.2/include/h323con.h:255,
from h323.cxx:1097:
/usr/include/sys/time.h:94: error: parse error before numeric constant
/usr/include/sys/time.h:108: error: redefinition of `struct itimerval'
/usr/include/linux/time.h:363: error: previous definition of `struct itimerval'
make[4]: *** [/home/mrvn/build/retry/openh323/openh323-1.12.2/lib/obj_linux_m68k_d/h323.o] Error 1
MfG
Goswin
----------------------------------------------------------------------
--- /usr/include/linux/time.h~ 2003-10-15 15:13:08.000000000 +0000
+++ /usr/include/linux/time.h 2003-11-11 18:12:58.000000000 +0000
@@ -4,6 +4,10 @@
#include <asm/param.h>
#include <linux/types.h>
+#ifndef __KERNEL
+#include <time.h>
+#else
+
#ifndef _STRUCT_TIMESPEC
#define _STRUCT_TIMESPEC
struct timespec {
@@ -22,8 +26,6 @@
int tz_dsttime; /* type of dst correction */
};
-#ifdef __KERNEL__
-
#include <linux/spinlock.h>
#include <linux/seqlock.h>
#include <linux/timex.h>
--- /usr/include/linux/time.h~ 2003-11-11 18:12:58.000000000 +0000
+++ /usr/include/linux/time.h 2003-11-11 18:23:43.000000000 +0000
@@ -353,10 +353,12 @@
#define ITIMER_VIRTUAL 1
#define ITIMER_PROF 2
+#ifdef __KERNEL__
struct itimerspec {
struct timespec it_interval; /* timer period */
struct timespec it_value; /* timer expiration */
};
+#endif
struct itimerval {
struct timeval it_interval; /* timer interval */
--- /usr/include/linux/time.h~ 2003-11-11 18:23:43.000000000 +0000
+++ /usr/include/linux/time.h 2003-11-13 10:45:33.000000000 +0000
@@ -345,6 +345,7 @@
#define FD_ISSET(fd,fdsetp) __FD_ISSET(fd,fdsetp)
#define FD_ZERO(fdsetp) __FD_ZERO(fdsetp)
+#ifdef __KERNEL__
/*
* Names of the interval timers, and structure
* defining a timer setting.
@@ -353,17 +354,16 @@
#define ITIMER_VIRTUAL 1
#define ITIMER_PROF 2
-#ifdef __KERNEL__
struct itimerspec {
struct timespec it_interval; /* timer period */
struct timespec it_value; /* timer expiration */
};
-#endif
struct itimerval {
struct timeval it_interval; /* timer interval */
struct timeval it_value; /* current value */
};
+#endif
/*
Reply to: