about summary refs log tree commit diff
path: root/iconvdata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-09-06 23:45:24 +0000
committerUlrich Drepper <drepper@redhat.com>1998-09-06 23:45:24 +0000
commit6796bc807aa3808f6afb5da42932e437bdd183cf (patch)
treef0610b5aebf183e95afb9f70c30d77ea82f9ef9e /iconvdata
parentbaa3334acc20834b32be1abf96f5942367c31a06 (diff)
downloadglibc-6796bc807aa3808f6afb5da42932e437bdd183cf.tar.gz
glibc-6796bc807aa3808f6afb5da42932e437bdd183cf.tar.xz
glibc-6796bc807aa3808f6afb5da42932e437bdd183cf.zip
Update.
1998-09-06 09:53 -0400  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* Makeconfig (+gccwarn): Remove -Wno-parentheses.

	* elf/dl-open.c: Quiet -Wparentheses warnings.
	* iconvdata/johab.c: Likewise.
	* iconvdata/uhc.c: Likewise.
	* inet/inet_net.c: Likewise.
	* io/fts.c: Likewise.
	* locale/newlocale.c: Likewise.
	* misc/getttyent.c: Likewise.
	* misc/mntent_r.c: Likewise.
	* misc/ttyslot.c: Likewise.
	* nscd/nscd_conf.c: Likewise.
	* nss/nsswitch.c: Likewise.
	* resolv/gethnamaddr.c: Likewise.
	* resolv/nsap_addr.c: Likewise.
	* resolv/res_debug.c: Likewise.
	* stdio-common/_itoa.c: Likewise.
	* stdlib/strtod.c: Likewise.
	* string/strverscmp.c: Likewise.
	* sunrpc/svc.c: Likewise.
	* sysdeps/libm-ieee754/e_cosh.c: Likewise.
	* sysdeps/libm-ieee754/e_gamma_r.c: Likewise.
	* sysdeps/libm-ieee754/e_sinh.c: Likewise.
	* sysdeps/posix/getaddrinfo.c: Likewise.

	* include/dlfcn.h: Likewise.
	* elf/dlfcn.h: Declare dladdr only for __USE_GNU.
	Define RTLD_DEFAULT.
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/johab.c6
-rw-r--r--iconvdata/uhc.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/iconvdata/johab.c b/iconvdata/johab.c
index 6da169438c..6a5d8be68f 100644
--- a/iconvdata/johab.c
+++ b/iconvdata/johab.c
@@ -220,11 +220,11 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 		  }							      \
 		else if (i > 0 && m > 0)				      \
 		  ch = ((i - 1) * 21 + (m - 1)) * 28 + f + 0xac00;	      \
-		else if (i > 0 && m == 0 & f == 0)			      \
+		else if (i > 0 && m == 0 && f == 0)			      \
 		  ch = init_to_ucs[i - 1];				      \
-		else if (i == 0 && m > 0 & f == 0)			      \
+		else if (i == 0 && m > 0 && f == 0)			      \
 		  ch = 0x314e + m;	/* 0x314f + m - 1 */		      \
-		else if (i == 0 && m == 0 & f > 0)			      \
+		else if (i == 0 && m == 0 && f > 0)			      \
 		  ch = final_to_ucs[f - 1];	/* round trip?? */	      \
 		else							      \
 		  {							      \
diff --git a/iconvdata/uhc.c b/iconvdata/uhc.c
index 0fa6d40f74..5aef36cdd0 100644
--- a/iconvdata/uhc.c
+++ b/iconvdata/uhc.c
@@ -3170,7 +3170,7 @@ static const char uhc_hangul_from_ucs[11172][2] =
 	*outptr++ = s[0];						      \
 	*outptr++ = s[1];						      \
       }									      \
-    else if (ch >= 0x4e00 && ch <= 0x9fa5 || ch >= 0xf900 && ch <= 0xfa0b)    \
+    else if ((ch >= 0x4e00 && ch <= 0x9fa5) || (ch >= 0xf900 && ch <= 0xfa0b))\
       {									      \
 	size_t written = ucs4_to_ksc5601_hanja (ch, outptr,		      \
 						(NEED_LENGTH_TEST	      \