From 44d234535ec43b70d72a7c3e7f54975bad7a5ce5 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Wed, 30 Jul 2003 15:58:24 +0000 Subject: [PATCH] reorganized so that we maintain only one interface specification --- src/libCom/osi/{os/WIN32 => }/epicsStdio.h | 2 +- src/libCom/osi/os/hpux/epicsStdio.h | 28 ---------------------- src/libCom/osi/os/posix/epicsStdio.h | 18 -------------- src/libCom/osi/os/vxWorks/epicsStdio.h | 27 --------------------- 4 files changed, 1 insertion(+), 74 deletions(-) rename src/libCom/osi/{os/WIN32 => }/epicsStdio.h (94%) delete mode 100644 src/libCom/osi/os/hpux/epicsStdio.h delete mode 100644 src/libCom/osi/os/posix/epicsStdio.h delete mode 100644 src/libCom/osi/os/vxWorks/epicsStdio.h diff --git a/src/libCom/osi/os/WIN32/epicsStdio.h b/src/libCom/osi/epicsStdio.h similarity index 94% rename from src/libCom/osi/os/WIN32/epicsStdio.h rename to src/libCom/osi/epicsStdio.h index 559a83eb4..497388f2b 100644 --- a/src/libCom/osi/os/WIN32/epicsStdio.h +++ b/src/libCom/osi/epicsStdio.h @@ -12,7 +12,6 @@ #define epicsStdioh #include -#include #ifdef __cplusplus extern "C" { @@ -24,6 +23,7 @@ epicsShareFunc int epicsShareAPI epicsSnprintf( char *str, size_t size, const char *format, ...); epicsShareFunc int epicsShareAPI epicsVsnprintf( char *str, size_t size, const char *format, va_list ap); +epicsShareFunc FILE * epicsShareAPI epicsTempFile ( void ); #ifdef __cplusplus } diff --git a/src/libCom/osi/os/hpux/epicsStdio.h b/src/libCom/osi/os/hpux/epicsStdio.h deleted file mode 100644 index 71639792d..000000000 --- a/src/libCom/osi/os/hpux/epicsStdio.h +++ /dev/null @@ -1,28 +0,0 @@ -/* epicsStdio.h */ -/*************************************************************************\ -* 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. -\*************************************************************************/ -#ifndef epicsStdioh -#define epicsStdioh - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -int epicsSnprintf ( char *str, size_t size, const char *format, ...); -int epicsVsnprintf ( char *str, size_t size, const char *format, va_list ap); - -#ifdef __cplusplus -} -#endif - -#endif /* epicsStdioh */ diff --git a/src/libCom/osi/os/posix/epicsStdio.h b/src/libCom/osi/os/posix/epicsStdio.h deleted file mode 100644 index dac7b78b0..000000000 --- a/src/libCom/osi/os/posix/epicsStdio.h +++ /dev/null @@ -1,18 +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. -\*************************************************************************/ -#ifndef epicsStdioh -#define epicsStdioh - -#include - -#define epicsVsnprintf vsnprintf -#define epicsSnprintf snprintf - -#endif /* epicsStdioh */ diff --git a/src/libCom/osi/os/vxWorks/epicsStdio.h b/src/libCom/osi/os/vxWorks/epicsStdio.h deleted file mode 100644 index dffa06143..000000000 --- a/src/libCom/osi/os/vxWorks/epicsStdio.h +++ /dev/null @@ -1,27 +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. -\*************************************************************************/ -#ifndef epicsStdioh -#define epicsStdioh - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -int epicsSnprintf(char *str, size_t size, const char *format, ...); -int epicsVsnprintf(char *str, size_t size, const char *format, va_list ap); - -#ifdef __cplusplus -} -#endif - -#endif /* epicsStdioh */