Menu
▾
▴
[Emc-commit] rcslib/src/os_intf Makefile.lib,4.34.2.1,4.34.2.2 _timer.c,4.42.2.1,4.42.2.2 timer.cc,4.36,4.36.2.1
|
From: <wsh...@us...> - 2003-08-18 23:19:55
|
Update of /cvsroot/emc/rcslib/src/os_intf
In directory sc8-pr-cvs1:/tmp/cvs-serv9848/src/os_intf
Modified Files:
Tag: wps_multiplat_dev_branch
Makefile.lib _timer.c timer.cc
Log Message:
.
Index: Makefile.lib
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/Makefile.lib,v
retrieving revision 4.34.2.1
retrieving revision 4.34.2.2
diff -C2 -d -r4.34.2.1 -r4.34.2.2
*** Makefile.lib 8 Aug 2003 14:21:14 -0000 4.34.2.1
--- Makefile.lib 18 Aug 2003 23:19:52 -0000 4.34.2.2
***************
*** 99,102 ****
--- 99,104 ----
inifile.h \
dbg_mem.h \
+ timer_no_config.h \
+ _timer_no_config.h \
fileops.h
Index: _timer.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/_timer.c,v
retrieving revision 4.42.2.1
retrieving revision 4.42.2.2
diff -C2 -d -r4.42.2.1 -r4.42.2.2
*** _timer.c 8 Aug 2003 14:21:14 -0000 4.42.2.1
--- _timer.c 18 Aug 2003 23:19:52 -0000 4.42.2.2
***************
*** 22,119 ****
#if HAVE_CONFIG_H
#include "rcs_config_include.h"
- #endif
-
- #include "rcs_defs.hh"
- #include "rcs_prnt.hh" /* rcs_print_error */
-
- #if !HAVE_CONFIG_H
-
- #ifndef NO_STDIO
- #include <stdio.h> /* NULL */
- #endif
-
- #include <errno.h> /* errno */
- #include <string.h> /* strerror() */
-
- #ifdef VXWORKS
-
- #include <vxWorks.h>
- #include <taskLib.h> /* taskDelay() */
- #include <tickLib.h> /* tickGet() */
- #include <sysLib.h> /* sysClkRateGet() */
- #include <timers.h> /* clock_gettime */
- #ifndef POWERPC
- #include "gtimer.hh" /* global_timer_available, get_Global_time() */
- #endif
-
- #endif /* VXWORKS */
-
- #ifdef LYNX
-
-
- #include <errno.h> /* EINTR */
- #include <unistd.h> /* select() */
- #include <time.h> /* CLK_TCK, since no _SC_CLK_TCK */
- #include <sys/time.h> /* struct timeval, gettimeofday(),
- struct itimerval, setitimer(),
- ITIMER_REAL */
-
-
- #endif /* LYNX */
-
- #if defined(SUN) || defined(SGI) || defined(sparcworks) || defined(darwin) || defined(qnx) || defined(linux)
- #include <errno.h> /* EINTR */
- #include <unistd.h> /* select(), sysconf(), _SC_CLK_TCK */
- #ifndef irix6
- #include <sys/time.h> /* struct timeval, gettimeofday(),
- struct itimerval, setitimer(),
- ITIMER_REAL */
- #endif
-
- #endif /* SUN */
-
- #ifdef linux
- #include <linux/version.h>
-
- #if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,2,0)
- #define LINUX_KERNEL_2_2_OR_LATER
- #include <sched.h>
- #endif
- #endif
- #endif
-
-
-
- #ifdef irix6
- #include <time.h>
- #endif
-
- #ifdef __MSDOS__
- #ifdef _Windows
- #ifdef USE_TOOL_HELP
- /* The timerCount function is more accurate than the GetTickCount() function
- but you need toolhelp.dll which comes with Windows 3.1 but not Windows 3.0 or
- Windows NT */
- #include "toolhelp.h" /* timerCount() */
#else
! #if defined(WIN32) && !defined(USE_OLD_WINSOCK)
! /* Lame problem if windows.h is included before winsock2.h many redefined
! compiler errors result. */
! #include <winsock2.h>
! #endif
! #include <windows.h> /* GetTickCount() */
! #endif
! #endif
! #include <time.h> /* clock(), CLK_TCK */
! #ifndef _Windows
! #include <dos.h> /* delay() */
! #endif
! #endif
!
! #if defined(mingw32)
! #include <windows.h>
! #endif
!
#endif /* ! HAVE_CONFIG_H */
--- 22,27 ----
#if HAVE_CONFIG_H
#include "rcs_config_include.h"
#else
! #include "_timer_no_config.h"
#endif /* ! HAVE_CONFIG_H */
Index: timer.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/timer.cc,v
retrieving revision 4.36
retrieving revision 4.36.2.1
diff -C2 -d -r4.36 -r4.36.2.1
*** timer.cc 6 May 2003 15:18:21 -0000 4.36
--- timer.cc 18 Aug 2003 23:19:52 -0000 4.36.2.1
***************
*** 14,98 ****
! #include "rcs_defs.hh" // __MSDOS__
! #include "dbg_mem.h" // DEBUG_MALLOC,DEBUG_FREE
!
! #ifdef VXWORKS
!
! extern "C"
! {
! #include <vxWorks.h>
!
! #ifndef NO_STDIO
! #include <stdio.h>
! #endif
!
! #include <string.h> // strtok(), strncmp()
! #include <stdlib.h> // atof()
! #include <taskLib.h> /* taskDelay() */
! #include <tickLib.h> /* tickGet() */
! #include <sysLib.h> /* sysClkRateGet() */
! }
!
! #endif /* VXWORKS */
!
! #ifdef LYNX
!
! extern "C"
! {
! #include <string.h> // strtok(), strncmp()
! #include <stdlib.h> // atof()
!
! #ifndef NO_STDIO
! #include <stdio.h> /* NULL */
! #endif
!
! #include <stdlib.h> /* exit() */
! #include <signal.h> /* struct sigaction, sigaction(), SIGALRM,
! sigset_t */
! #include <errno.h> /* perror(), EINTR */
! #include <unistd.h> /* select() */
! #include <time.h> /* CLK_TCK, since no _SC_CLK_TCK, */
! /* setitimer() */
! #include <sys/time.h> /* struct timeval, gettimeofday(),
! struct itimerval,
! ITIMER_REAL */
!
! }
!
! #endif /* LYNX */
!
! #if defined(SUN) || defined(LINUX)
!
! extern "C"
! {
! #include <stdlib.h> // atof()
! #include <string.h> // strtok(), strncmp()
!
! #ifndef NO_STDIO
! #include <stdio.h> /* NULL */
! #endif
!
! #include <stdlib.h> /* exit() */
! #include <signal.h> /* struct sigaction, sigaction(), SIGALRM,
! sigset_t */
! #include <errno.h> /* perror(), EINTR */
! #include <unistd.h> /* select(), sysconf(), _SC_CLK_TCK */
! #include <sys/time.h> /* struct timeval, gettimeofday(),
! struct itimerval, setitimer(),
! ITIMER_REAL */
! #include <sys/types.h>
! #include <sys/wait.h> // waitpid()
! }
!
! #endif /* SUN */
!
! #ifdef __MSDOS__
! #include <stdlib.h> // atof()
! #include <string.h> // strtok(), strncmp()
! #include <time.h> /* clock(), CLK_TCK */
! #ifndef _WINDOWS
! #include <dos.h> /* delay() */
! #endif
! #endif
#include "inetfile.hh" // inet_file_open(), inet_file_gets()
--- 14,22 ----
! #if HAVE_CONFIG_H
! #include "rcs_config_include.h"
! #else
! #include "timer_no_config.h"
! #endif /* ! HAVE_CONFIG_H */
#include "inetfile.hh" // inet_file_open(), inet_file_gets()
|
