epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fixed conflict >>>>>

Browse Source
This commit is contained in:
Jeff Hill
1997-05-01 20:30:15 +00:00
parent cbd5d9a36e
commit 5bf13da02c
3 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libCom/calc/postfix.c
View File

@@ -303,14 +303,7 @@ register short *pno_bytes;
*
* convert an infix expression to a postfix expression
*/
<<<<<<< postfix.c
long epicsShareAPI postfix(
register char *pinfix,
register char *ppostfix,
short *perror)
=======
long postfix(char *pinfix,char *ppostfix,short *perror)
>>>>>>> 1.23
{
short no_bytes;
register short operand_needed;

2
src/libCom/post.h
View File

@@ -119,4 +119,4 @@ epicsShareFunc long epicsShareAPI
calcPerform(double *parg, double *presult, char *post);
epicsShareFunc long epicsShareAPI
postfix(register char *pinfix, register char *ppostfix, short *perror);
postfix(char *pinfix, char *ppostfix, short *perror);

7
src/libCom/postfix.c
View File

@@ -303,14 +303,7 @@ register short *pno_bytes;
*
* convert an infix expression to a postfix expression
*/
<<<<<<< postfix.c
long epicsShareAPI postfix(
register char *pinfix,
register char *ppostfix,
short *perror)
=======
long postfix(char *pinfix,char *ppostfix,short *perror)
>>>>>>> 1.23
{
short no_bytes;
register short operand_needed;