about summary refs log tree commit diff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-05-25 14:54:29 +0000
committerUlrich Drepper <drepper@redhat.com>1999-05-25 14:54:29 +0000
commit40cbb1a73b1010ac37710742e42d14fd6108dc07 (patch)
treeba488189b02bffa965a16290aea7aa724a1ceaae /stdio-common
parentdffbec5f51b02fde19142300ded922b52f5eb5a8 (diff)
downloadglibc-40cbb1a73b1010ac37710742e42d14fd6108dc07.tar.gz
glibc-40cbb1a73b1010ac37710742e42d14fd6108dc07.tar.xz
glibc-40cbb1a73b1010ac37710742e42d14fd6108dc07.zip
Update.
	* wcsmbs/wcstol.c: Moved to ...
	* sysdeps/generic/wcstol.c: ...here.
	* wcsmbs/wcstoul.c: Moved to ...
	* sysdeps/generic/wcstoul.c: ...here.
	* wcsmbs/wcstoll.c: Moved to ...
	* sysdeps/generic/wcstoll.c: ...here.
	* wcsmbs/wcstoull.c: Moved to ...
	* sysdeps/generic/wcstoull.c: ...here.
	* wcsmbs/wcstol_l.c: Moved to ...
	* sysdeps/generic/wcstol_l.c: ...here.
	* wcsmbs/wcstoul_l.c: Moved to ...
	* sysdeps/generic/wcstoul_l.c: ...here.
	* wcsmbs/wcstoll_l.c: Moved to ...
	* sysdeps/generic/wcstoll_l.c: ...here.
	* wcsmbs/wcstoull_l.c: Moved to ...
	* sysdeps/generic/wcstoull_l.c: ...here.

	* sysdeps/wordexp-64/wcstol.c: New file.
	* sysdeps/wordexp-64/wcstoul.c: New file.
	* sysdeps/wordexp-64/wcstoll.c: New file.
	* sysdeps/wordexp-64/wcstoull.c: New file.
	* sysdeps/wordexp-64/wcstol_l.c: New file.
	* sysdeps/wordexp-64/wcstoul_l.c: New file.
	* sysdeps/wordexp-64/wcstoll_l.c: New file.
	* sysdeps/wordexp-64/wcstoull_l.c: New file.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/vfscanf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 1dbfc53ec9..a5f6f4e4b0 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -446,7 +446,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 	    {
 	      /* A double `l' is equivalent to an `L'.  */
 	      ++f;
-	      flags |= need_longlong ? LONGDBL | LONG;
+	      flags |= need_longlong ? LONGDBL : LONG;
 	    }
 	  else
 	    /* ints are long ints.  */
@@ -455,7 +455,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 	case 'q':
 	case 'L':
 	  /* doubles are long doubles, and ints are long long ints.  */
-	  flags |= need_longlong ? LONGDBL | LONG;
+	  flags |= need_longlong ? LONGDBL : LONG;
 	  break;
 	case 'a':
 	  /* The `a' is used as a flag only if followed by `s', `S' or