From 32d48f7dcdc91efe2b6f7d2e60259c1cc59577cf Mon Sep 17 00:00:00 2001 From: "W. Eric Norum" Date: Fri, 14 May 2004 13:36:01 +0000 Subject: [PATCH] Clean up system-call-interrupt mechanism. --- .../osi/os/Darwin/systemCallIntMech.cpp | 23 ------------------- src/libCom/osi/os/Linux/systemCallIntMech.cpp | 22 ------------------ src/libCom/osi/os/RTEMS/systemCallIntMech.cpp | 22 ------------------ .../osi/os/cygwin32/systemCallIntMech.cpp | 2 +- src/libCom/osi/os/posix/systemCallIntMech.cpp | 2 +- .../osi/os/vxWorks/systemCallIntMech.cpp | 22 ------------------ 6 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 src/libCom/osi/os/Darwin/systemCallIntMech.cpp delete mode 100644 src/libCom/osi/os/Linux/systemCallIntMech.cpp delete mode 100644 src/libCom/osi/os/RTEMS/systemCallIntMech.cpp delete mode 100644 src/libCom/osi/os/vxWorks/systemCallIntMech.cpp diff --git a/src/libCom/osi/os/Darwin/systemCallIntMech.cpp b/src/libCom/osi/os/Darwin/systemCallIntMech.cpp deleted file mode 100644 index bdac4ef7c..000000000 --- a/src/libCom/osi/os/Darwin/systemCallIntMech.cpp +++ /dev/null @@ -1,23 +0,0 @@ - -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* $Id$ */ -/* - * Author: Jeff Hill - */ - -#include "osiSock.h" - -enum epicsSocketSystemCallInterruptMechanismQueryInfo - epicsSocketSystemCallInterruptMechanismQuery () -{ - return esscimqi_socketSigAlarmRequired; - /*return esscimqi_socketBothShutdownRequired;*/ -} diff --git a/src/libCom/osi/os/Linux/systemCallIntMech.cpp b/src/libCom/osi/os/Linux/systemCallIntMech.cpp deleted file mode 100644 index 2cd37b1aa..000000000 --- a/src/libCom/osi/os/Linux/systemCallIntMech.cpp +++ /dev/null @@ -1,22 +0,0 @@ - -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* $Id$ */ -/* - * Author: Jeff Hill - */ - -#include "osiSock.h" - -enum epicsSocketSystemCallInterruptMechanismQueryInfo - epicsSocketSystemCallInterruptMechanismQuery () -{ - return esscimqi_socketBothShutdownRequired; -} diff --git a/src/libCom/osi/os/RTEMS/systemCallIntMech.cpp b/src/libCom/osi/os/RTEMS/systemCallIntMech.cpp deleted file mode 100644 index 2cd37b1aa..000000000 --- a/src/libCom/osi/os/RTEMS/systemCallIntMech.cpp +++ /dev/null @@ -1,22 +0,0 @@ - -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* $Id$ */ -/* - * Author: Jeff Hill - */ - -#include "osiSock.h" - -enum epicsSocketSystemCallInterruptMechanismQueryInfo - epicsSocketSystemCallInterruptMechanismQuery () -{ - return esscimqi_socketBothShutdownRequired; -} diff --git a/src/libCom/osi/os/cygwin32/systemCallIntMech.cpp b/src/libCom/osi/os/cygwin32/systemCallIntMech.cpp index 5b755139e..c31bcef2d 100644 --- a/src/libCom/osi/os/cygwin32/systemCallIntMech.cpp +++ b/src/libCom/osi/os/cygwin32/systemCallIntMech.cpp @@ -19,5 +19,5 @@ enum epicsSocketSystemCallInterruptMechanismQueryInfo epicsSocketSystemCallInterruptMechanismQuery () { - return esscimqi_socketBothShutdownRequired; + return esscimqi_socketCloseRequired; } diff --git a/src/libCom/osi/os/posix/systemCallIntMech.cpp b/src/libCom/osi/os/posix/systemCallIntMech.cpp index 1fe5f6559..2cd37b1aa 100644 --- a/src/libCom/osi/os/posix/systemCallIntMech.cpp +++ b/src/libCom/osi/os/posix/systemCallIntMech.cpp @@ -18,5 +18,5 @@ enum epicsSocketSystemCallInterruptMechanismQueryInfo epicsSocketSystemCallInterruptMechanismQuery () { - return esscimqi_socketSigAlarmRequired; + return esscimqi_socketBothShutdownRequired; } diff --git a/src/libCom/osi/os/vxWorks/systemCallIntMech.cpp b/src/libCom/osi/os/vxWorks/systemCallIntMech.cpp deleted file mode 100644 index 2cd37b1aa..000000000 --- a/src/libCom/osi/os/vxWorks/systemCallIntMech.cpp +++ /dev/null @@ -1,22 +0,0 @@ - -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* $Id$ */ -/* - * Author: Jeff Hill - */ - -#include "osiSock.h" - -enum epicsSocketSystemCallInterruptMechanismQueryInfo - epicsSocketSystemCallInterruptMechanismQuery () -{ - return esscimqi_socketBothShutdownRequired; -}