projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
output
/
measure.c
diff --git
a/src/output/measure.c
b/src/output/measure.c
index 8de7ed1d486bf9ca62a4d399c2b12f4fcb6d8281..60894f1cc25f81b3b21ae862ee646e0ac1d3c0ac 100644
(file)
--- a/
src/output/measure.c
+++ b/
src/output/measure.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2007, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2007, 2009, 2010
, 2011
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-16,17
+16,18
@@
#include <config.h>
#include <config.h>
-#include
<output/measure.h>
+#include
"output/measure.h"
+#include <gl/c-strtod.h>
#include <ctype.h>
#include <errno.h>
#if HAVE_LC_PAPER
#include <langinfo.h>
#endif
#include <ctype.h>
#include <errno.h>
#if HAVE_LC_PAPER
#include <langinfo.h>
#endif
-#include <libpspp/str.h>
#include <stdlib.h>
#include <stdlib.h>
-#include <data/file-name.h>
+#include "data/file-name.h"
+#include "libpspp/str.h"
#include "gl/error.h"
#include "gl/error.h"
@@
-50,7
+51,7
@@
measure_dimension (const char *dimen)
char *tail;
/* Number. */
char *tail;
/* Number. */
- raw = strtod (dimen, &tail);
+ raw =
c_
strtod (dimen, &tail);
if (raw < 0.0)
goto syntax_error;
if (raw < 0.0)
goto syntax_error;
@@
-150,7
+151,7
@@
parse_paper_size (const char *size, int *h, int *v)
char *tail;
/* Width. */
char *tail;
/* Width. */
- raw_h = strtod (size, &tail);
+ raw_h =
c_
strtod (size, &tail);
if (raw_h <= 0.0)
return false;
if (raw_h <= 0.0)
return false;
@@
-158,7
+159,7
@@
parse_paper_size (const char *size, int *h, int *v)
tail += strspn (tail, CC_SPACES "x,");
/* Length. */
tail += strspn (tail, CC_SPACES "x,");
/* Length. */
- raw_v = strtod (tail, &tail);
+ raw_v =
c_
strtod (tail, &tail);
if (raw_v <= 0.0)
return false;
if (raw_v <= 0.0)
return false;