Merge branch 'master' of github.com:paulscherrerinstitute/StreamDevice

This commit is contained in:
2017-01-19 09:49:49 +01:00
3 changed files with 5 additions and 6 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
O.*
*~

View File

@ -23,6 +23,8 @@
#include <string.h>
#include <stdlib.h>
#include <sys/types.h>
#ifndef __GNUC__
#define __attribute__(x)
#endif

View File

@ -19,17 +19,12 @@
***************************************************************/
#include <math.h>
#include <epicsMath.h>
#include <menuConvert.h>
#include <aiRecord.h>
#include "devStream.h"
#include <epicsExport.h>
#ifdef vxWorks
#include <private/mathP.h>
#define isinf(x) isInf(x)
#define isnan(x) isNan(x)
#endif
static long readData (dbCommon *record, format_t *format)
{
aiRecord *ai = (aiRecord *) record;