projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Got rid of approx.h and replaced all references to approx_eq() by ==,
[pspp]
/
src
/
output.c
diff --git
a/src/output.c
b/src/output.c
index b804978d6d1d4567be2f56b4938ea1a94e8951f7..6a4ed78dbb9ada555050b262de963b1456e2b892 100644
(file)
--- a/
src/output.c
+++ b/
src/output.c
@@
-25,7
+25,6
@@
#include <errno.h>
#include <ctype.h>
#include "alloc.h"
#include <errno.h>
#include <ctype.h>
#include "alloc.h"
-#include "approx.h"
#include "devind.h"
#include "error.h"
#include "filename.h"
#include "devind.h"
#include "error.h"
#include "filename.h"
@@
-959,7
+958,7
@@
outp_evaluate_dimension (char *dimen, char **tail)
if (c <= 0.0 || ptail == s)
goto lossage;
s = ptail;
if (c <= 0.0 || ptail == s)
goto lossage;
s = ptail;
- if (
approx_eq (c, 0.0)
)
+ if (
c == 0.0
)
goto lossage;
if (value > 0)
value += b / c;
goto lossage;
if (value > 0)
value += b / c;
@@
-971,7
+970,7
@@
outp_evaluate_dimension (char *dimen, char **tail)
double b;
s = &ptail[1];
b = strtod (s, &ptail);
double b;
s = &ptail[1];
b = strtod (s, &ptail);
- if (
approx_le (b, 0.0)
|| ptail == s)
+ if (
b <= 0.0
|| ptail == s)
goto lossage;
s = ptail;
value /= b;
goto lossage;
s = ptail;
value /= b;
@@
-1030,7
+1029,7
@@
outp_evaluate_dimension (char *dimen, char **tail)
ptail += 2;
value *= factor;
}
ptail += 2;
value *= factor;
}
- if (
approx_lt (value, 0.0)
)
+ if (
value <= 0.0
)
goto lossage;
if (tail)
*tail = ptail;
goto lossage;
if (tail)
*tail = ptail;