projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed issues which arose on x86_64 architecture
[pspp]
/
src
/
data-in.c
diff --git
a/src/data-in.c
b/src/data-in.c
index 3a49fa23706e8537881c204ffaeb9f83b99204d7..879ad10bd4fc3442a0be3935eb7ba5b0c70875a4 100644
(file)
--- a/
src/data-in.c
+++ b/
src/data-in.c
@@
-26,9
+26,9
@@
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
-#include
"bool.h"
+#include
<stdbool.h>
#include "error.h"
#include "error.h"
-#include "getl
ine
.h"
+#include "getl.h"
#include "calendar.h"
#include "lexer.h"
#include "magic.h"
#include "calendar.h"
#include "lexer.h"
#include "magic.h"
@@
-36,9
+36,11
@@
#include "settings.h"
#include "str.h"
#include "var.h"
#include "settings.h"
#include "str.h"
#include "var.h"
-
\f
-#include "debug-print.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
+#include "debug-print.h"
\f
/* Specialized error routine. */
\f
/* Specialized error routine. */
@@
-212,9
+214,7
@@
parse_numeric (struct data_in *i)
return false;
}
return false;
}
- if (have_char (i)
- && (tolower (*i->s) == 'e' || tolower (*i->s) == 'd'
- || (type == FMT_E && (*i->s == '+' || *i->s == '-'))))
+ if (have_char (i) && strchr ("eEdD-+", *i->s))
{
/* Get the exponent specified after the `e' or `E'. */
long exp;
{
/* Get the exponent specified after the `e' or `E'. */
long exp;
@@
-457,7
+457,9
@@
parse_Z (struct data_in *i)
static inline bool
parse_IB (struct data_in *i)
{
static inline bool
parse_IB (struct data_in *i)
{
+#ifndef WORDS_BIGENDIAN
char buf[64];
char buf[64];
+#endif
const char *p;
unsigned char xor;
const char *p;
unsigned char xor;