Menu
▾
▴
[Emc-commit] rcslib/src/os_intf Makefile,4.36,4.36.2.1 Makefile.lib,4.34,4.34.2.1 _timer.c,4.42,4.42.2.1 fileops.c,4.32,4.32.2.1 inetnull.cc,4.32,4.32.2.1 rcs_exit.cc,4.33,4.33.2.1 unix_sem.c,4.57,4.57.2.1
Update of /cvsroot/emc/rcslib/src/os_intf
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/src/os_intf
Modified Files:
Tag: wps_multiplat_dev_branch
Makefile Makefile.lib _timer.c fileops.c inetnull.cc
rcs_exit.cc unix_sem.c
Log Message:
First commit on wps_multiplat_dev_branch
Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/Makefile,v
retrieving revision 4.36
retrieving revision 4.36.2.1
diff -C2 -d -r4.36 -r4.36.2.1
*** Makefile 7 May 2003 19:35:29 -0000 4.36
--- Makefile 8 Aug 2003 14:21:14 -0000 4.36.2.1
***************
*** 12,30 ****
include Makefile.lib
! # Declare which files are to be released
! HEADERS = _sem.h \
! sem.hh \
! _shm.h \
! shm.hh \
! _table.h \
! table.hh \
! _timer.h \
! timer.hh \
! gtimer.hh \
! rcs_exit.hh \
! inetfile.hh \
! inifile.h \
! dbg_mem.h \
! fileops.h
ifneq ($(findstring vxworks, $(PLAT)), )
--- 12,16 ----
include Makefile.lib
! HEADERS=$(OS_INTF_HEADERS)
ifneq ($(findstring vxworks, $(PLAT)), )
***************
*** 39,43 ****
timer.cc \
gtimer.cc \
- rcs_exit.cc \
inetnull.cc \
inetfile.cc \
--- 25,28 ----
***************
*** 60,64 ****
_timer.c \
timer.cc \
- rcs_exit.cc \
inetfile.cc \
inettest.c \
--- 45,48 ----
Index: Makefile.lib
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/Makefile.lib,v
retrieving revision 4.34
retrieving revision 4.34.2.1
diff -C2 -d -r4.34 -r4.34.2.1
*** Makefile.lib 27 Mar 2003 20:13:29 -0000 4.34
--- Makefile.lib 8 Aug 2003 14:21:14 -0000 4.34.2.1
***************
*** 3,7 ****
ifneq ($(findstring vxworksSun, $(PLAT)),vxworksSun)
! LIBRCS_OBJS := $(LIBRCS_OBJS) \
_sem.o \
sem.o \
--- 3,7 ----
ifneq ($(findstring vxworksSun, $(PLAT)),vxworksSun)
! OS_INTF_OBJS:= \
_sem.o \
sem.o \
***************
*** 14,18 ****
gtimer.o \
_gtimer.o \
- rcs_exit.o \
inetnull.o \
inifile.o \
--- 14,17 ----
***************
*** 21,25 ****
else
! LIBRCS_OBJS := $(LIBRCS_OBJS) \
_sem.o \
sem.o \
--- 20,24 ----
else
! OS_INTF_OBJS:= \
_sem.o \
sem.o \
***************
*** 30,34 ****
_timer.o \
timer.o \
- rcs_exit.o \
inetnull.o \
inifile.o \
--- 29,32 ----
***************
*** 40,44 ****
else
! LIBRCS_OBJS := $(LIBRCS_OBJS) \
_sem.o \
sem.o \
--- 38,42 ----
else
! OS_INTF_OBJS:= \
_sem.o \
sem.o \
***************
*** 49,53 ****
_timer.o \
timer.o \
- rcs_exit.o \
inetnull.o \
inifile.o \
--- 47,50 ----
***************
*** 62,66 ****
! LIBRCS_OBJS := $(LIBRCS_OBJS) \
_sem.o \
sem.o \
--- 59,63 ----
! OS_INTF_OBJS:= \
_sem.o \
sem.o \
***************
*** 71,75 ****
_timer.o \
timer.o \
- rcs_exit.o \
$(INETFILEFILE).o \
inifile.o \
--- 68,71 ----
***************
*** 79,88 ****
ifdef DEBUG_MEMORY
! LIBRCS_OBJS := $(LIBRCS_OBJS) \
dbg_mem.o
endif
--- 75,103 ----
ifdef DEBUG_MEMORY
! OS_INTF_OBJS:= $(OS_INTF_OBJS) \
dbg_mem.o
endif
+ LIBRCS_OBJS:= $(LIBRCS_OBJS) \
+ $(OS_INTF_OBJS)
+
+
+ # Declare which files are to be released
+ OS_INTF_HEADERS = _sem.h \
+ sem.hh \
+ _shm.h \
+ shm.hh \
+ _table.h \
+ table.hh \
+ _timer.h \
+ timer.hh \
+ gtimer.hh \
+ rcs_exit.hh \
+ inetfile.hh \
+ inifile.h \
+ dbg_mem.h \
+ fileops.h
Index: _timer.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/_timer.c,v
retrieving revision 4.42
retrieving revision 4.42.2.1
diff -C2 -d -r4.42 -r4.42.2.1
*** _timer.c 6 May 2003 15:18:21 -0000 4.42
--- _timer.c 8 Aug 2003 14:21:14 -0000 4.42.2.1
***************
*** 62,66 ****
#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 */
--- 62,66 ----
#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 */
***************
*** 73,77 ****
#endif /* SUN */
! #ifdef LINUX
#include <linux/version.h>
--- 73,77 ----
#endif /* SUN */
! #ifdef linux
#include <linux/version.h>
***************
*** 155,159 ****
#endif
! #if defined(SUN) || defined(SGI) || defined(LINUX) || defined(darwin) || defined(qnx) || defined(IRIX)
return 1.0 / (double) sysconf (_SC_CLK_TCK);
#define CLK_TCK_RETURNED
--- 155,159 ----
#endif
! #if defined(SUN) || defined(SGI) || defined(linux) || defined(darwin) || defined(qnx) || defined(IRIX)
return 1.0 / (double) sysconf (_SC_CLK_TCK);
#define CLK_TCK_RETURNED
***************
*** 317,321 ****
#endif
! #if defined(LINUX) || defined(darwin) || defined(qnx) || defined(IRIX)
struct timeval tp;
--- 317,321 ----
#endif
! #if defined(linux) || defined(darwin) || defined(qnx) || defined(IRIX)
struct timeval tp;
***************
*** 343,347 ****
#define ETIME_RETURNED
! #endif /* LINUX */
#ifdef _Windows
--- 343,347 ----
#define ETIME_RETURNED
! #endif /* linux */
#ifdef _Windows
***************
*** 530,534 ****
#endif
! #if defined (SUN) || defined (LYNX) || defined(irix5) || defined(irix6) || defined(irix64) || defined(LINUX) || defined(darwin) || defined(qnx)
#ifndef VXWORKS
#if defined(sunos5) || defined(LINUX_KERNEL_2_2_OR_LATER)
--- 530,534 ----
#endif
! #if defined (SUN) || defined (LYNX) || defined(irix5) || defined(irix6) || defined(irix64) || defined(linux) || defined(darwin) || defined(qnx)
#ifndef VXWORKS
#if defined(sunos5) || defined(LINUX_KERNEL_2_2_OR_LATER)
Index: fileops.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/fileops.c,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1
*** fileops.c 6 Sep 2001 14:32:55 -0000 4.32
--- fileops.c 8 Aug 2003 14:21:14 -0000 4.32.2.1
***************
*** 1,2 ****
--- 1,7 ----
+
+ /* This line prevents findsource from adding this file to the Makefile */
+ #define NOT_A_DEFAULT_RCSLIB_SOURCE 1
+
+
/*
fileops.c
Index: inetnull.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/inetnull.cc,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1
*** inetnull.cc 6 Sep 2001 14:32:55 -0000 4.32
--- inetnull.cc 8 Aug 2003 14:21:14 -0000 4.32.2.1
***************
*** 103,105 ****
--- 103,106 ----
return 0;
}
+ return -1;
}
Index: rcs_exit.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/rcs_exit.cc,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** rcs_exit.cc 6 May 2003 15:18:21 -0000 4.33
--- rcs_exit.cc 8 Aug 2003 14:21:14 -0000 4.33.2.1
***************
*** 1,2 ****
--- 1,8 ----
+
+
+ /* This line prevents findsource from adding this file to the Makefile */
+ #define NOT_A_DEFAULT_RCSLIB_SOURCE 1
+
+
/**********************************************************************
* File: rcs_exit.cc
Index: unix_sem.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/unix_sem.c,v
retrieving revision 4.57
retrieving revision 4.57.2.1
diff -C2 -d -r4.57 -r4.57.2.1
*** unix_sem.c 6 May 2003 15:18:21 -0000 4.57
--- unix_sem.c 8 Aug 2003 14:21:14 -0000 4.57.2.1
***************
*** 1,3 ****
-
#ifdef HAVE_CONFIG_H
#include "rcs_config_include.h"
--- 1,2 ----
***************
*** 53,65 ****
#endif /* irix6 */
- #if defined(os5) && defined(sparc)
- union semun
- {
- int val;
- struct semid_ds *buf;
- ushort *array;
- };
- #endif
-
#if defined(sunos5) || defined(linux) || defined(POSIX_SEMAPHORES)
--- 52,55 ----
***************
*** 112,117 ****
--- 102,117 ----
struct seminfo *__buf; /* buffer for IPC_INFO */
};
+ #define UNION_SEMUN_DEFINED
+ #endif
+ #if defined(os5) && defined(sparc) && !defined(UNION_SEMUN_DEFINED)
+ union semun
+ {
+ int val;
+ struct semid_ds *buf;
+ ushort *array;
+ };
#endif
+
#endif /* POSIX_SEMAPHORES */
|
