epics/epics-base
0
0 Fork 0
Code Issues Pull Requests Projects Wiki Activity

removed conflict >>>>>

Browse Source
This commit is contained in:
Jeff Hill committed 1997-05-01 20:26:07 +00:00
1 parent bb8e8f46cb
commit cbd5d9a36e
2 files changed
-8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/libCom/calc/calcPerform.c
-4
View File
@@ -122,12 +122,8 @@ static double local_random();
#define PI 3.141592654
#endif
<<<<<<< calcPerform.c
epicsShareFunc long epicsShareAPI
calcPerform(double *parg, double *presult, char *post)
=======
long calcPerform( double *parg, double *presult, char *post)
>>>>>>> 1.23
{
double *pstacktop; /* stack of values */
double stack[80];
src/libCom/calcPerform.c
-4
View File
@@ -122,12 +122,8 @@ static double local_random();
#define PI 3.141592654
#endif
<<<<<<< calcPerform.c
epicsShareFunc long epicsShareAPI
calcPerform(double *parg, double *presult, char *post)
=======
long calcPerform( double *parg, double *presult, char *post)
>>>>>>> 1.23
{
double *pstacktop; /* stack of values */
double stack[80];