From 72254c526f353393502f1b6f3025854661145583 Mon Sep 17 00:00:00 2001
From: SASANO Takayoshi <uaa@uaa.org.uk>
Date: Sat, 9 Dec 2023 20:11:07 +0900
Subject: [PATCH] remove register keyword

Signed-off-by: SASANO Takayoshi <uaa@uaa.org.uk>
---
 cmpstr.c     |  4 +--
 code.c       |  8 +++---
 common.c     |  6 ++---
 conv.c       | 20 +++++++-------
 cvtclknj.c   |  2 +-
 display.c    | 20 +++++++-------
 douon.c      | 54 ++++++++++++++++++-------------------
 edit.c       | 52 +++++++++++++++++------------------
 etc.c        | 16 +++++------
 eucmessage.c |  4 +--
 fuzoku.c     |  4 +--
 henkan.c     | 76 ++++++++++++++++++++++++++--------------------------
 kigou.c      | 14 +++++-----
 libif.c      |  8 +++---
 memory2.c    |  8 +++---
 mvmemd.c     |  6 ++---
 mvmemi.c     |  6 ++---
 nmttyslot.c  |  6 ++---
 rk_conv.c    | 52 +++++++++++++++++------------------
 romaji.c     | 36 ++++++++++++-------------
 screen.c     | 58 +++++++++++++++++++--------------------
 setup.c      |  6 ++---
 sj2code.c    | 10 +++----
 sj3_rkcv.c   | 36 ++++++++++++-------------
 sj_typedef.h |  8 ------
 sjgetchar.c  | 16 +++++------
 sjrc.c       | 16 +++++------
 sjrc2.c      | 60 ++++++++++++++++++++---------------------
 skiphblk.c   |  2 +-
 stat_conv.c  | 66 ++++++++++++++++++++++-----------------------
 string.c     | 10 +++----
 toroku.c     | 24 ++++++++---------
 wc16_str.c   | 42 ++++++++++++++---------------
 33 files changed, 374 insertions(+), 382 deletions(-)

diff --git a/cmpstr.c b/cmpstr.c
index 923bc75..ca21ad0 100644
--- a/cmpstr.c
+++ b/cmpstr.c
@@ -42,8 +42,8 @@
 #include "sj_typedef.h"
 
 Int	cmpstr(src, dst)
-Reg1	Uchar	*src;
-Reg2	Uchar	*dst;
+Uchar	*src;
+Uchar	*dst;
 {
 	while (*src) {
 		if (*src != *dst) return FALSE;
diff --git a/code.c b/code.c
index ddb0cc5..63cbf30 100644
--- a/code.c
+++ b/code.c
@@ -54,7 +54,7 @@ codeconv(c, rkstr)
 wchar16_t c;
 u_int *rkstr;
 {
-	register u_short ccode, i;
+	u_short ccode, i;
         u_short CheckCcode();
 	extern int erase_char;
 
@@ -94,8 +94,8 @@ u_short
 CheckCcode (c)
 wchar16_t c;
 {
-        register u_char c1;   
-        register u_short code;
+        u_char c1;
+        u_short code;
 
         if (!WcIsASCII(c) ||  !isxdigit(WcLowByte(c)) ||
             (cur_code == CODE_KUTEN && !isdigit(WcLowByte(c))))
@@ -152,7 +152,7 @@ wchar16_t c;
 u_short
 strtocode()
 {
-        register int c;
+        int c;
         u_short code;
 
 	while (ccnt < 4) {
diff --git a/common.c b/common.c
index cc709b8..1ed2140 100644
--- a/common.c
+++ b/common.c
@@ -50,7 +50,7 @@ Conversion	*default_conversion;
 Conversion *
 AllocConversion ()
 {
-	register Conversion	*c;
+	Conversion	*c;
 
 	if ((c = (Conversion *)malloc (sizeof(Conversion))) == NULL) {
 		fprintf (stderr, "conversion: can't alloc memory\n\r");
@@ -126,9 +126,9 @@ EndConversion ()
 
 int
 wcbyte(str)
-register wchar16_t *str;
+wchar16_t *str;
 {
-	register count=0;
+	count=0;
 
 	while (*str) {
 		if (WcHighMASK & *str++) 
diff --git a/conv.c b/conv.c
index f8e722c..7e9da24 100644
--- a/conv.c
+++ b/conv.c
@@ -99,7 +99,7 @@ convert_stat ()
 
 inputprocess ()
 {
-	register int	c;
+	int	c;
 	wchar16_t		obuf[2];
 
 	if (Direct) {
@@ -139,9 +139,9 @@ static int	escape = 0;
 
 inkey ()
 {
-	register Conversion	*cv;
-	register int	i, j;
-        register wchar16_t c;
+	Conversion	*cv;
+	int	i, j;
+        wchar16_t c;
 
 	cv = current_conversion;
 	keyvalue = KEY_NORMAL;
@@ -196,15 +196,15 @@ inkey ()
 
 sequence (buf, count)
 wchar16_t         *buf;
-register int	*count;
+int	*count;
 {
 	
 
 
-	register int	n;
+	int	n;
 	SELECT_FD	ifds;
 	struct timeval	t;
-	register wchar16_t *s;
+	wchar16_t *s;
 	int		value;
 
 
@@ -241,11 +241,11 @@ register int	*count;
 
 
 parse_escape (s, count, more)
-register wchar16_t *s;
-register int	*count;
+wchar16_t *s;
+int	*count;
 int		more;
 {
-	register int	i, j;
+	int	i, j;
 	wchar16_t		temp[KEYBUFSIZ];
 	int		possible;
 
diff --git a/cvtclknj.c b/cvtclknj.c
index ce335e2..73ceeae 100644
--- a/cvtclknj.c
+++ b/cvtclknj.c
@@ -47,7 +47,7 @@ Void	cvtkouho(), setstyrec();
 
 Void	cvtclknj()
 {
-	Reg1	KHREC	*krec;		
+	KHREC	*krec;
 	Int	i;
 
 	
diff --git a/display.c b/display.c
index d2efd29..e9dcbe4 100644
--- a/display.c
+++ b/display.c
@@ -62,7 +62,7 @@ checkterm ()
 {
 	char	*kb, *area, *tgetstr (), *tmp;
 	int	val;
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = current_conversion;
 
@@ -185,7 +185,7 @@ end_guideline ()
 put_space (n)
 int	n;
 {
-	register int	i;
+	int	i;
 
 	for (i = 0 ; i < n ; i ++)
 		putchar (' ');
@@ -307,7 +307,7 @@ CursorRead (row, col)
 u_short	*row, *col;
 {
 	
-	register int	count;
+	int	count;
 	int		row1, col1, row2, col2;
 
 	row2 = col2 = 0;
@@ -343,11 +343,11 @@ u_short	*row, *col;
 CRP (row, col)
 int	*row, *col;
 {
-	register char	*sa, *sd;
-	register int	c;
+	char	*sa, *sd;
+	int	c;
 	char		Rchar[4], Cchar[4];
 	wchar16_t		Back[BACKLIM];
-	register int	Back_count, count;
+	int	Back_count, count;
 
 	
 
@@ -413,12 +413,12 @@ top:
 
 
 unget_inkey2 (s, n)
-register wchar16_t *s;
-register int	n;
+wchar16_t *s;
+int	n;
 {
 	extern wchar16_t	ibuf[];
 	extern int	buf_count;
-	register int	i;
+	int	i;
 
 	if (buf_count < KEYBUFSIZ - n) {
 		for (i = 0 ; i < n ; i ++)
@@ -456,7 +456,7 @@ Clear_EOL ()
 StartGuide (row, col)
 u_short	*row, *col;
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = current_conversion;
 	master_flush_flag = 0;
diff --git a/douon.c b/douon.c
index 880b18f..b9a5070 100644
--- a/douon.c
+++ b/douon.c
@@ -54,7 +54,7 @@ int		n;
 int		choice;
 int		reconv;
 {
-	register int	len;
+	int	len;
 
         Dcount = SJ2_getdouon (s, d, n, choice, reconv);
 
@@ -77,7 +77,7 @@ int		reconv;
 
 exec_douon ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 	int	val;
 
 	cv = GetConversion ();
@@ -97,7 +97,7 @@ exec_douon ()
 wrap_douon (back)
 int	back;	
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 	int	val;
 
 	cv = current_conversion;
@@ -124,10 +124,10 @@ int	gnum;
 {
 	
 
-	register int	i, j;
-	register int	len;
-	register wchar16_t	*s;
-	register int	dispnum;
+	int	i, j;
+	int	len;
+	wchar16_t	*s;
+	int	dispnum;
 	int		num;
 	int		displen;
 	int		base;
@@ -136,7 +136,7 @@ int	gnum;
 
 	int		gakusyuu;
 	u_short		row, col;
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = current_conversion;
 
@@ -252,10 +252,10 @@ int	gnum;
 }
 
 Dselect (lim)
-register int	lim;
+int	lim;
 {
 	extern int	keyvalue;
-	register int	c, num;
+	int	c, num;
 	char		s[2];
 
 	SaveConversion ();
@@ -297,8 +297,8 @@ int	reconv;
 {
 	
 
-	register int	len;
-	register wchar16_t	*s;
+	int	len;
+	wchar16_t	*s;
 
 	SJ_getdouon (yomi, HenkanDouon, num, choice, reconv);
 
@@ -314,8 +314,8 @@ int	reconv;
 Sdouon (Choice)
 int Choice;
 {
-	register Conversion	*cv;
-	register int	i, j;
+	Conversion	*cv;
+	int	i, j;
 	int		len;
 	wchar16_t		yomi[BUFFLENGTH * 2];
 	int		count;
@@ -395,10 +395,10 @@ tail:
 Rdouon (back)
 int	back;	
 {
-	register Conversion	*cv;
-	register int	i, j;
-	register int	len;
-	register wchar16_t	*s;
+	Conversion	*cv;
+	int	i, j;
+	int	len;
+	wchar16_t	*s;
 
 	cv = current_conversion;
 	if (Dcount > 0) {
@@ -429,8 +429,8 @@ int	back;
 Bkanji (kanji)
 wchar16_t	*kanji;
 {
-	register Conversion	*cv;
-	register int	i;
+	Conversion	*cv;
+	int	i;
 	int		plen, len;
 	wchar16_t		*s;
 
@@ -458,9 +458,9 @@ struct studyrec	*wordid;
 
 cl_gakusyuu ()
 {
-	register Conversion	*cv;
-	register int	i, j;
-	register int	o_point, n_point;
+	Conversion	*cv;
+	int	i, j;
+	int	o_point, n_point;
 
 	cv = current_conversion;
 	for (i = 0 ; i < cv->Bnum ; i ++) {
@@ -484,8 +484,8 @@ cl_gakusyuu ()
 check_and_gakusyuu (m, n)
 int	m, n;
 {
-	register Conversion	*cv;
-	register int	i, j;
+	Conversion	*cv;
+	int	i, j;
 
 	cv = current_conversion;
 	i = m;
@@ -502,8 +502,8 @@ void
 go_gakusyuu (n)
 int	n;
 {
-	register Conversion	*cv;
-	register int	i, j;
+	Conversion	*cv;
+	int	i, j;
 	wchar16_t		yomi1[BUFFLENGTH], yomi2[BUFFLENGTH];
 	struct studyrec	*gdatap;
 	int		len;
diff --git a/edit.c b/edit.c
index db2ad0c..fff18a1 100644
--- a/edit.c
+++ b/edit.c
@@ -45,9 +45,9 @@ static int	iedit, jedit;
 static int	ilen, jlen;
 
 push_obj (i, j)
-register int	i, j;
+int	i, j;
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	jpoint = cv->Ppoint[j];
@@ -58,9 +58,9 @@ register int	i, j;
 }
 
 pop_obj (i, j)
-register int	i, j;
+int	i, j;
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	cv->Ppoint[j] = jpoint;
@@ -74,8 +74,8 @@ register int	i, j;
 
 Bbig ()
 {
-	register Conversion	*cv;
-	register int		i, j, k;
+	Conversion	*cv;
+	int		i, j, k;
 	int			moji, last, val;
 
 	cv = GetConversion ();
@@ -137,8 +137,8 @@ Bbig ()
 Bsmall (small)
 int	small;		
 {
-	register Conversion	*cv;
-	register int	i, j, k, moji;
+	Conversion	*cv;
+	int	i, j, k, moji;
 	int		val;
 
 	cv = GetConversion ();
@@ -240,8 +240,8 @@ int	small;
 void
 Bdelete ()
 {
-	register Conversion	*cv;
-	register int	i, j, deletelen, val;
+	Conversion	*cv;
+	int	i, j, deletelen, val;
 
 	cv = GetConversion ();
 	if (cv->CurBun < 0) {
@@ -290,13 +290,13 @@ Bdelete ()
 
 void
 Chain (n, len)
-register int	n;	
-register int	len;	
+int	n;
+int	len;
 {
-	register Conversion	*cv;
-	register int		i;
-	register wchar16_t		*p;
-	register u_short	*pp;
+	Conversion	*cv;
+	int		i;
+	wchar16_t		*p;
+	u_short	*pp;
 	int 			mlen, plen, ipos, rlen, imlen;
 
 	cv = GetConversion ();
@@ -339,9 +339,9 @@ static int Elimit;
 static int Ehlimit;
 exec_edit ()
 {
-	register Conversion	*cv;
-	register int		edit, inc, i;
-	register wchar16_t	*s;
+	Conversion	*cv;
+	int		edit, inc, i;
+	wchar16_t	*s;
 	wchar16_t			Htmp[BUFFLENGTH], Ztmp[BUFFLENGTH * 2];
 	u_short			Omode[BUFFLENGTH * 2];
 	int			bun;
@@ -619,7 +619,7 @@ wchar16_t	*Hs, *Zs;
 u_short *omode;
 int cur, num;
 {
-	register int	i, len, inc;
+	int	i, len, inc;
 	int		beep_on, icur1, icur2;
 	wchar16_t		roma[SHORTBUFFSIZE+1], kana[SHORTBUFFSIZE+1];
 	wchar16_t		work[DLEN+1];
@@ -699,7 +699,7 @@ int *cur, num;
 {
 	wchar16_t		work[DLEN + 1];
 	wchar16_t		work2[DLEN + 1];
-	register int	len;
+	int	len;
 
 	len = wslen(&Zs[*cur]);
 	if (len < num)
@@ -725,7 +725,7 @@ wchar16_t	*Hs, *Zs;
 u_short *omode;
 int cur;
 {
-	register int	inc, len, i;
+	int	inc, len, i;
 	int		limit, hlimit, ylen, res, icur, rlen;
 	wchar16_t		ztmp[DLEN + 1], htmp[DLEN + 1];
 	u_short		otmp[DLEN + 1];
@@ -793,7 +793,7 @@ wchar16_t	*Hs, *Zs;
 u_short *omode;
 int	cur, num;
 {
-	register int	i, j;
+	int	i, j;
 	int		icur, len, rlen;
 
 	if (!(omode[cur] & OMODE_MASK))
@@ -827,7 +827,7 @@ wchar16_t *Hs, *Zs;
 u_short *omode;
 int cur;
 {
-	register int i, j, len;
+	int i, j, len;
 	int prep, nextp;
 	int hprep, hnextp;
 	wchar16_t hkana[BUFFLENGTH], *hkp;
@@ -853,7 +853,7 @@ int cur;
 }
 
 Print_EOL (s)
-register wchar16_t *s;
+wchar16_t *s;
 {
 	if (*s != '\0')
 		SJ_print (s);
@@ -865,7 +865,7 @@ register wchar16_t *s;
 backspace (n)
 int	n;
 {
-	register int	i;
+	int	i;
 
 	for (i = 0 ; i < n ; i ++)
 		Backspace ();
diff --git a/etc.c b/etc.c
index 23ce20f..3d58429 100644
--- a/etc.c
+++ b/etc.c
@@ -49,11 +49,11 @@ exec_etc (key)
 int	key;
 {
 	u_short		row, col;
-	register int	inc;
+	int	inc;
 	int		chbun;
 	int 		edited;
 	int		etckey;
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 
@@ -162,7 +162,7 @@ normal:
 Ssbun(flag)
 int flag;
 {
-	register Conversion *cv;
+	Conversion *cv;
 	static short ScurBun, SpreBun;
 
 	cv = GetConversion();
@@ -183,7 +183,7 @@ int	key;
 {
 	extern int	u_etckeys;
 	extern int	Uetckey[], Uetcval[];
-	register int	i;
+	int	i;
 	int		val;
 
 	for (i = 0 ; i < u_etckeys ; i ++) {
@@ -222,7 +222,7 @@ helplevel ()
 	wchar16_t                 wtmp[BUFFLENGTH];
 	u_char                  mtmp[BUFFLENGTH];
 	u_char			tmp[BUFFLENGTH];
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 
@@ -302,7 +302,7 @@ static int	seed = 100000;
 
 change_weight ()
 {
-	register int	c;
+	int	c;
 	char		s[2];
 	char		tmp[BUFFLENGTH];
 	u_char          mtmp[BUFFLENGTH];
@@ -334,7 +334,7 @@ int	sw;
 dconnect(aflag)
 int aflag;
 {
-        register int err;
+        int err;
 	char tmp[BUFFLENGTH];
 	wchar16_t wtmp[BUFFLENGTH];
 	u_char  dtmp[BUFFLENGTH];
@@ -377,7 +377,7 @@ IsDcflag()
 
 reconnect ()
 {
-	register int	inc, err;
+	int	inc, err;
 	char		tmp[BUFFLENGTH], *hp;
 	char		newserv[SHORTLENGTH * 2], *nsp;
 	wchar16_t wtmp[BUFFLENGTH];
diff --git a/eucmessage.c b/eucmessage.c
index 837b59d..c152df5 100644
--- a/eucmessage.c
+++ b/eucmessage.c
@@ -282,7 +282,7 @@ struct wcvtkey wcvtkeytbl[CURWCVTKEY];
 int 
 init_wcvtkey()
 {
-	register int i = 0;
+	int i = 0;
 
 	for (i = 0; i < CURWCVTKEY; i++) {
 		wcvtkeytbl[i].key_seq[0] = 0;
@@ -432,7 +432,7 @@ init_messages()
 	char *loc;
         short message_len[CURMESSAGES];
 	int ret;
-	register int i;
+	int i;
         int all_len = 0;
 	int saved_locale = 0;
 	extern int current_locale;
diff --git a/fuzoku.c b/fuzoku.c
index 46f063d..c50a473 100644
--- a/fuzoku.c
+++ b/fuzoku.c
@@ -50,7 +50,7 @@ Int	terminate();
 
 
 Static	Int	fzkstrcmp(yptr, fzkp, saml)
-Uchar	*yptr;			
+Uchar	*yptr;
 Uchar	TFar	*fzkp;		
 Int	*saml;			
 {
@@ -200,7 +200,7 @@ TypeCnct	left;
 RECURS
 Void	srchfzk(jrec, yptr, right, level)
 JREC		*jrec;			
-Reg1		Uchar	*yptr;		
+Uchar		*yptr;
 TypeCnct	right;			
 Int		level;			
 {
diff --git a/henkan.c b/henkan.c
index 45c9cec..c987b5e 100644
--- a/henkan.c
+++ b/henkan.c
@@ -46,9 +46,9 @@ int	i_point;
 
 exec_henkan ()
 {
-	register Conversion	*cv;
-	register int		i, j;
-	register wchar16_t		*s, *p;
+	Conversion	*cv;
+	int		i, j;
+	wchar16_t		*s, *p;
 	short			sp;
 	int			len, rlen, ilen;
 	int			opos, ipos, bnum;
@@ -229,8 +229,8 @@ exec_henkan ()
 addBun(cur, end)
 int cur, end;
 {
-	register int i;
-	register Conversion *cv;
+	int i;
+	Conversion *cv;
 
 	cv = GetConversion();
 	for (i = end; i > cur; i--) {
@@ -244,8 +244,8 @@ int cur, end;
 delspan(cur)
 int cur;
 {
-	register int i;
-	register Conversion *cv;
+	int i;
+	Conversion *cv;
 
 	cv = GetConversion();
 	for (i = cur; i < cv->span_point - 1; i++) {
@@ -258,8 +258,8 @@ int cur;
 delBun(cur, end)
 int cur, end;
 {
-	register int i;
-	register Conversion *cv;
+	int i;
+	Conversion *cv;
 
 	cv = GetConversion();
 	cv->Bun[cur].srclen += cv->Bun[cur + 1].srclen;
@@ -274,7 +274,7 @@ int cur, end;
 
 
 IsHex (c)
-register wchar16_t c;
+wchar16_t c;
 {
 	return(iswxdigit(c));
 }
@@ -282,7 +282,7 @@ register wchar16_t c;
 Getcode (in, out)
 wchar16_t	*in, *out;
 {
-	register int  c, i, j;
+	int  c, i, j;
 	u_char        s[5];
         int             base, c_code;
         u_short         code;
@@ -355,8 +355,8 @@ int	num;
 wchar16_t	*s;
 u_char	type;
 {
-	register Conversion	*cv;
-	register int	len, ilen;
+	Conversion	*cv;
+	int	len, ilen;
 	u_char		itype;
 	wchar16_t Htmp[BUFFLENGTH], Ztmp[BUFFLENGTH * 2];
 
@@ -428,9 +428,9 @@ int	num;
 wchar16_t	*htmp, *ztmp;
 u_short *omode;
 {
-	register Conversion	*cv;
-	register int	i;
-	register int	len, ilen;
+	Conversion	*cv;
+	int	i;
+	int	len, ilen;
 	u_short		*op;
 	u_char		type;
 	wchar16_t		Ztmp[DLEN + 1];
@@ -474,8 +474,8 @@ getistr(s, ostr, len)
 wchar16_t *s, *ostr;
 int len;
 {
-	register int ipos, opos;
-	register Conversion *cv;
+	int ipos, opos;
+	Conversion *cv;
 	int rlen;
 
 	cv = GetConversion();
@@ -495,7 +495,7 @@ int len;
 exec_muhenkan (first)
 int	first;
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	cv->Bnum = 1;
@@ -538,8 +538,8 @@ Bstr (bnum, s)
 int	bnum;
 wchar16_t	*s;
 {
-	register Conversion	*cv;
-	register int	i, len;
+	Conversion	*cv;
+	int	i, len;
 
 	cv = GetConversion ();
 	if (cv->Bkettei[bnum] & Bmuhenkan) {
@@ -588,9 +588,9 @@ wchar16_t	*s;
 
 
 mode_muhenkan (mod, bkettei)
-register int	mod, bkettei;
+int	mod, bkettei;
 {
-	register int	def;
+	int	def;
 
 	if (!(bkettei & Bmuhenkan))
 		return (KEY_ZHIRA);
@@ -605,10 +605,10 @@ register int	mod, bkettei;
 }
 
 Bchange (mod)
-register int	mod;
+int	mod;
 {
-	register Conversion	*cv;
-	register int	i;
+	Conversion	*cv;
+	int	i;
 	int		PushKettei;
 
 	cv = GetConversion ();
@@ -662,8 +662,8 @@ register int	mod;
 
 Bdisp (redraw)
 {
-	register Conversion	*cv;
-	register int	i;
+	Conversion	*cv;
+	int	i;
 	int		len;
 	wchar16_t		BDtmp[BUFFLENGTH * 2];
 	int             displen;
@@ -708,9 +708,9 @@ Bdisp (redraw)
 void
 Rdisp ()
 {
-	register Conversion	*cv;
-	register int	i;
-	register int	Total;
+	Conversion	*cv;
+	int	i;
+	int	Total;
 	int		len;
 	wchar16_t		BDtmp[BUFFLENGTH * 2];
 	int             displen;
@@ -757,10 +757,10 @@ Rdisp ()
 
 AfterAllPrint (from, Total)
 int	from;
-register int	Total;
+int	Total;
 {
-	register Conversion	*cv;
-	register int	i;
+	Conversion	*cv;
+	int	i;
 	int		len;
 	wchar16_t		BDtmp[BUFFLENGTH * 2];
 	int             displen;
@@ -807,7 +807,7 @@ register int	Total;
 void
 Bright ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 	int	flag;
 
 	cv = GetConversion ();
@@ -830,7 +830,7 @@ Bright ()
 void
 Bleft ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 	int	flag;
 
 	cv = GetConversion ();
@@ -853,7 +853,7 @@ Bleft ()
 void
 Blast ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	cv->PreBun = cv->CurBun;
@@ -871,7 +871,7 @@ Blast ()
 void
 Btop ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	cv->PreBun = cv->CurBun;
diff --git a/kigou.c b/kigou.c
index 48c4dbe..dba25c6 100644
--- a/kigou.c
+++ b/kigou.c
@@ -52,7 +52,7 @@ void input_kigou();
 kigou ()
 {
 	extern int	keyvalue;
-        register int    increse, code, basecode;
+        int    increse, code, basecode;
         int             inc, ki, low;
         u_short         num, CheckCcode(), strtocode();
 	int		rval;
@@ -198,7 +198,7 @@ int	c;
 }
 
 IsCKey (inc)
-register int	inc;
+int	inc;
 {
 	switch (inc) {
 	case 'l':
@@ -215,9 +215,9 @@ register int	inc;
 }
 
 guide_kigou (bcode, code, increse)
-register int	bcode, code, increse;
+int	bcode, code, increse;
 {
-	register int	i;
+	int	i;
 	extern wchar16_t	Mguide[];
 	wchar16_t          wtmp[20];
 	char		tmp[20];
@@ -248,7 +248,7 @@ register int	bcode, code, increse;
 
 
 pkigou (code)
-register int    code;
+int    code;
 {
 	wchar16_t	tmp[3];
         u_short ccode;
@@ -271,11 +271,11 @@ register int    code;
 
 void
 input_kigou (basecode, code, increse)
-register int	basecode, code, increse;
+int	basecode, code, increse;
 {
 	wchar16_t	s[2];
         u_short ccode, svlen;
-        register Conversion *cv;
+        Conversion *cv;
 
 	if (jis2euc(code) == 0) {
                 beep();
diff --git a/libif.c b/libif.c
index b0118cc..4e94090 100644
--- a/libif.c
+++ b/libif.c
@@ -103,7 +103,7 @@ sjislen(str, max)
 unsigned char *str;
 int max;
 {
-	register int len = 0, bytes = 1;
+	int len = 0, bytes = 1;
 
 	if (!max) return 0;
 	while ((bytes <= max) && *str) {
@@ -125,7 +125,7 @@ euclen(str, max)
 unsigned char *str;
 int max;
 {
-	register int len = 0, bytes = 1;
+	int len = 0, bytes = 1;
 
 	if (!max) return 0;
 	while ((bytes <= max) && *str) {
@@ -294,7 +294,7 @@ SJ2_henkan_end ()
 
 SJ2_henkan_init ()
 {
-        register int i, err;
+        int i, err;
 	int *err_dict = NULL;
 	int  err_num = 0;
 
@@ -335,7 +335,7 @@ SJ2_henkan_init ()
 
 sj3_autocon() 
 {
-        register int i, err;
+        int i, err;
   
 	if (dict_num && dict_list) {
 		if (!(err = sj3_open_with_list(chmyhname(cur_serv), user_name, dict_num,
diff --git a/memory2.c b/memory2.c
index 579a0df..29c62f9 100644
--- a/memory2.c
+++ b/memory2.c
@@ -40,7 +40,7 @@
 Void	free_jrec(), free_clrec();
 
 JREC	*free_jlst(p)
-Reg1	JREC	*p;
+JREC	*p;
 {
 	JREC	*jpk;
 	JREC	*jp;
@@ -71,7 +71,7 @@ Reg1	JREC	*p;
 }
 
 CLREC	*free_clst(p, l)
-Reg1	CLREC	*p;
+CLREC	*p;
 Int	l;
 {
 	CLREC	*cpk;
@@ -116,7 +116,7 @@ Int	l;
 }
 
 Void	free_clall(p)
-Reg1	CLREC	*p;
+CLREC	*p;
 {
 	CLREC	*next;
 
@@ -129,7 +129,7 @@ Reg1	CLREC	*p;
 }
 
 Void	free_jall(p)
-Reg1	JREC	*p;
+JREC	*p;
 {
 	JREC	*next;
 
diff --git a/mvmemd.c b/mvmemd.c
index f410d7d..8ecad4b 100644
--- a/mvmemd.c
+++ b/mvmemd.c
@@ -39,9 +39,9 @@
 #include "sj_typedef.h"
 
 Void	mvmemd(src, dest, len)
-Reg1	Uchar	*src;
-Reg2	Uchar	*dest;
-Reg3	Int	len;
+Uchar	*src;
+Uchar	*dest;
+Int	len;
 {
 	while (len-- > 0) *(--dest) = *(--src);
 }
diff --git a/mvmemi.c b/mvmemi.c
index 4c0445a..855bfa3 100644
--- a/mvmemi.c
+++ b/mvmemi.c
@@ -39,9 +39,9 @@
 #include "sj_typedef.h"
 
 Void	mvmemi(src, dest, len)
-Reg1	Uchar	*src;
-Reg2	Uchar	*dest;
-Reg3	Int	len;
+Uchar	*src;
+Uchar	*dest;
+Int	len;
 {
 	while (len-- > 0) *dest++ = *src++;
 }
diff --git a/nmttyslot.c b/nmttyslot.c
index 7429962..47328c2 100644
--- a/nmttyslot.c
+++ b/nmttyslot.c
@@ -54,8 +54,8 @@ static	char	*ttys	= "/etc/ttys";
 nmttyslot (name)
 char	*name;
 {
-	register char	*tp, *p;
-	register int	s, tf;
+	char	*tp, *p;
+	int	s, tf;
 
 	tp = name;
 
@@ -82,7 +82,7 @@ getttys (f)
 int	f;
 {
 	static char line[LINESIZE];
-	register char *lp;
+	char *lp;
 top:
 	for (lp = line ; lp < &line[LINESIZE] ; lp ++) {
 		if (read (f, lp, 1) != 1)
diff --git a/rk_conv.c b/rk_conv.c
index 2b1f5a6..d334b8e 100644
--- a/rk_conv.c
+++ b/rk_conv.c
@@ -489,7 +489,7 @@ sj3_rkinit_sub(rkfile, mbfunc)
 char *rkfile;
 int (*mbfunc)();
 {
-	register char *p;
+	char *p;
 	int len, klen, rlen, retv;
 	FILE *fp, *fopen();
 	char line[MAXLEN + 1];
@@ -562,8 +562,8 @@ char *istr;
 wchar16_t *ostr;
 int *len;
 {
-	register char c, *p;
-	register int i;
+	char c, *p;
+	int i;
 
 	while (ENDMARK(*istr))
 		istr++;
@@ -620,9 +620,9 @@ char *istr;
 wchar16_t *ostr;
 int *len;
 {
-	register u_char c;	
-	register u_char *p;
-	register int i;
+	u_char c;
+	u_char *p;
+	int i;
 	u_short cc;
 
 	while (ENDMARK(*istr))
@@ -682,7 +682,7 @@ int *len;
 
 cltable()
 {
-	register int i;
+	int i;
 
 	if (rkpp != NULL) {
 	    for (i = 0; i < MAXCODE; i++) {
@@ -704,8 +704,8 @@ chk_rstr(rstr, rkey, rlen, klen)
 wchar16_t *rstr, *rkey;
 int rlen, klen;
 {
-	register int i;
-	register wchar16_t *p;
+	int i;
+	wchar16_t *p;
 
 	if (rlen >= klen)
 		return(1);
@@ -724,8 +724,8 @@ int rlen, klen;
 RkTablW16 *
 rkalloc()
 {
-	register RkTablW16 *rkp;
-	register RkbufRec *rkbrp;
+	RkTablW16 *rkp;
+	RkbufRec *rkbrp;
 
 	if (rkpp == NULL) {
 		rkp = (RkTablW16 *)malloc(RKSIZE * sizeof(RkTablW16));
@@ -762,8 +762,8 @@ wchar16_t **cp;
 wchar16_t *str;
 int len;
 {
-	register wchar16_t *strp;
-	register StrbufRec *sbrp;
+	wchar16_t *strp;
+	StrbufRec *sbrp;
 
 	if (len <= 1)
 		return(0);
@@ -798,9 +798,9 @@ kstradd(cp, kstr, len)
 wchar16_t **cp, *kstr;
 int len;
 {
-	register int i;
-	register wchar16_t *usp;
-	register YmibufRec *ybrp;
+	int i;
+	wchar16_t *usp;
+	YmibufRec *ybrp;
 
 	if (len <= 1)
 		return(0);
@@ -836,8 +836,8 @@ mktable(key, len)
 wchar16_t *key;
 int len;
 {
-	register int i;
-	register RkTablW16 *nrktp, *orktp;
+	int i;
+	RkTablW16 *nrktp, *orktp;
 	RkTablW16 *rktp;
 	u_int code;
 
@@ -908,8 +908,8 @@ sj3_rkconvc(c, rkstr)
 wchar16_t c;
 u_int *rkstr;
 {
-	register int i;
-	register wchar16_t *p, *q;
+	int i;
+	wchar16_t *p, *q;
 	int len;
 	wchar16_t wstr[MAXLLEN];
 	u_int kstr[MAXLLEN], *kp;
@@ -983,8 +983,8 @@ u_int *kstr;
 int wlen;
 {
 
-	register int i;
-	register wchar16_t *p, *q, *s;
+	int i;
+	wchar16_t *p, *q, *s;
 	int rlen, len;
 	wchar16_t svstr[MAXLLEN];
 	RkTablW16 *rktp;
@@ -1185,9 +1185,9 @@ wchar16_t *wstr;
 wchar16_t *kstr;
 {
 
-	register int i;
-	register wchar16_t *p, *q, *s;
-	register u_short cc;
+	int i;
+	wchar16_t *p, *q, *s;
+	u_short cc;
 	int rlen, len;
 	wchar16_t svstr[MAXLLEN];
 	RkTablW16 *rktp;
@@ -1248,7 +1248,7 @@ rkmatch(s1, s2, len)
 wchar16_t *s1, *s2;
 int len;
 {
-	register int i;
+	int i;
 
 	i = 1;
 	if (s2 == NULL)
diff --git a/romaji.c b/romaji.c
index 56a97ad..a660458 100644
--- a/romaji.c
+++ b/romaji.c
@@ -46,10 +46,10 @@ extern int rkerrbell;
 exec_romaji(c)
 wchar16_t	c;
 {
-	register Conversion	*cv;
-	register wchar16_t *p;
-	register u_short c1, cc;
-	register u_int c2;
+	Conversion	*cv;
+	wchar16_t *p;
+	u_short c1, cc;
+	u_int c2;
 	u_short op;
 	u_char mode;
 	int len, i;
@@ -212,8 +212,8 @@ wchar16_t	c;
 move_cur(kval)
 int kval;
 {
-	register Conversion *cv;
-	register int i;
+	Conversion *cv;
+	int i;
 
 	cv = GetConversion();
 	switch(kval) {
@@ -255,8 +255,8 @@ int kval;
 addten(pos, c)
 u_short pos, c;
 {
-	register u_short prefix;
-	register Conversion *cv;
+	u_short prefix;
+	Conversion *cv;
 
 	cv = GetConversion();
 	prefix = cv->out_buf[pos];
@@ -266,7 +266,7 @@ u_short pos, c;
 getipos(pos)
 u_short pos;
 {
-	register Conversion *cv;
+	Conversion *cv;
 
 	cv = GetConversion();
 	return(getipos2(cv->out_mode, pos));
@@ -276,8 +276,8 @@ getipos2(omode, pos)
 u_short *omode;
 u_short pos;
 {
-	register u_short ipos;
-	register int i;
+	u_short ipos;
+	int i;
 
 	ipos = 0;
 	for (i = 0; i < (unsigned int)pos; i++) {
@@ -290,8 +290,8 @@ sj_rkconv(s1, s2, len)
 wchar16_t *s1, *s2;
 int len;
 {
-	register int i, rlen;
-	register u_int *kp;
+	int i, rlen;
+	u_int *kp;
 	int res, klen;
 	wchar16_t roma[SHORTBUFFSIZE + 1];
 	u_int kstr[MAXLLEN];
@@ -347,8 +347,8 @@ wchar16_t *s1, *s2;
 u_short *omode;
 int len;
 {
-	register int i, rlen;
-	register u_int *kp;
+	int i, rlen;
+	u_int *kp;
 	int res, klen, mlen;
 	u_short cc, c, prefix;
 	wchar16_t roma[SHORTBUFFSIZE + 1];
@@ -464,9 +464,9 @@ wchar16_t	c, *hbuf, *kbuf;
 u_short *omode;
 int cur, hcur;
 {
-	register u_short c1, cc;
-	register u_int c2;
-	register int i;
+	u_short c1, cc;
+	u_int c2;
+	int i;
 	int ocur, len, retv;
 	u_int rkstr[MAXLLEN], *rkp;
 
diff --git a/screen.c b/screen.c
index 25e7cc5..f89b92b 100644
--- a/screen.c
+++ b/screen.c
@@ -47,9 +47,9 @@ wchar16_t		Mguide[LINE_LENGTH + 1];
 
 
 vbackchar (n)
-register int	n;
+int	n;
 {
-	register int	i;
+	int	i;
 
 	for (i=0 ; i < n ; i++)
 		VBackspace ();
@@ -64,7 +64,7 @@ register int	n;
 
 wrap_off ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	cv->wrap = 0;
@@ -73,7 +73,7 @@ wrap_off ()
 
 wrap_on ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	cv->wrap = 1;
@@ -84,7 +84,7 @@ wrap_on ()
 
 Vput_space ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	put_space (1);
@@ -99,8 +99,8 @@ Vput_space ()
 
 VBackspace ()
 {
-	register Conversion	*cv;
-	register int	i;
+	Conversion	*cv;
+	int	i;
 
 	cv = GetConversion ();
 	if (cv->wrap && ((cv->CurrentVcol % cv->column) == 1)) {
@@ -151,9 +151,9 @@ vprintU (s, mod)
 wchar16_t	*s;
 char	mod;	
 {
-	register Conversion	*cv;
-	register int		i, col, oldcol, len;
-	register u_short	*p;
+	Conversion	*cv;
+	int		i, col, oldcol, len;
+	u_short	*p;
 
 	cv = GetConversion ();
 	printU (s);
@@ -188,9 +188,9 @@ vprintR (s, mod)
 wchar16_t	*s;
 char	mod;	
 {
-	register Conversion	*cv;
-	register int		i, col, oldcol, len;
-	register u_short	*p;
+	Conversion	*cv;
+	int		i, col, oldcol, len;
+	u_short	*p;
 
 	cv = GetConversion ();
 	printR (s);
@@ -265,7 +265,7 @@ wchar16_t	*s;
 
 Csave ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	CursorRead (&(cv->SavedRow), &(cv->SavedCol));
@@ -277,7 +277,7 @@ Csave ()
 SetVcol (index)
 int	index;
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	cv->Vlen = index;
@@ -286,7 +286,7 @@ int	index;
 
 Cload ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	CursorSet (cv->SavedRow, cv->SavedCol);
@@ -295,8 +295,8 @@ Cload ()
 Cclear (redraw)
 int	redraw;
 {
-	register Conversion	*cv;
-	register int	spaces;
+	Conversion	*cv;
+	int	spaces;
 	u_short		row, col;
 
 	if (redraw) {
@@ -312,10 +312,10 @@ int	redraw;
 }
 
 Cgoto (index)
-register int	index;
+int	index;
 {
-	register Conversion	*cv;
-	register int	row, col;
+	Conversion	*cv;
+	int	row, col;
 
 	cv = GetConversion ();
 	SetVcol (index);
@@ -326,8 +326,8 @@ register int	index;
 
 ClearToMax ()
 {
-	register Conversion	*cv;
-	register int	space;
+	Conversion	*cv;
+	int	space;
 
 	cv = GetConversion ();
 	space = cv->MaxVcol - cv->CurrentVcol;
@@ -336,8 +336,8 @@ ClearToMax ()
 
 Ccheck ()
 {
-	register Conversion	*cv;
-	register int	row, tmp, diff;
+	Conversion	*cv;
+	int	row, tmp, diff;
 
 	if (Cscroll ()) {
 		cv = GetConversion ();
@@ -352,9 +352,9 @@ Ccheck ()
 }
 
 spaceR (s)
-register wchar16_t	*s;
+wchar16_t	*s;
 {
-	register wchar16_t	*t;
+	wchar16_t	*t;
 	wchar16_t		tmp[40];
 	t = tmp;
 	while (*s != '\0') {
@@ -417,9 +417,9 @@ int	mode;
 
 disp_mode ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 	int	c_code;
-	register wchar16_t	*Pmode, *Bmode;
+	wchar16_t	*Pmode, *Bmode;
 	cv = GetConversion ();
 	switch (cv->Imode) {
 	case MODE_CODE:
diff --git a/setup.c b/setup.c
index 4ba866a..5cf7f44 100644
--- a/setup.c
+++ b/setup.c
@@ -158,7 +158,7 @@ static	u_char	*get_int(p, pv_dst)
 u_char	*p;
 void	*pv_dst;
 {
-	register char	*fmt;
+	char	*fmt;
 	int		*dst;
 
 	dst = pv_dst;
@@ -286,7 +286,7 @@ struct	optlist {
 static	int	skip_blank(fp)
 FILE	*fp;
 {
-	register int	c;
+	int	c;
 
 	c = getc(fp);
 	while (c == ' ' || c == '\t') c = getc(fp);
@@ -295,7 +295,7 @@ FILE	*fp;
 static	int	skip_line(fp)
 FILE	*fp;
 {
-	register int	c;
+	int	c;
 
 	c = getc(fp);
 	while (c != '\n' && c != EOF) c = getc(fp);
diff --git a/sj2code.c b/sj2code.c
index 4edbf7c..cc2a838 100644
--- a/sj2code.c
+++ b/sj2code.c
@@ -42,9 +42,9 @@
 
 Int	sj2cd_chr(euc, yomi)
 Uchar	*euc;			
-Reg2	Uchar	*yomi;		
+Uchar	*yomi;
 {
-	Reg1	Uchar	chr;
+	Uchar	chr;
 
 	if ((chr = *euc++) == EUC_a1) {
 		chr = *euc;
@@ -118,9 +118,9 @@ Reg2	Uchar	*yomi;
 
 
 Int	sj2cd_str(euc, yomi, len)
-Reg1	Uchar	*euc;	
-Reg2	Uchar	*yomi;	
-Reg3	Int	len;	
+Uchar	*euc;
+Uchar	*yomi;
+Int	len;
 {
 	
 	if (!len--) return FALSE;
diff --git a/sj3_rkcv.c b/sj3_rkcv.c
index a9c925b..77e0d9c 100644
--- a/sj3_rkcv.c
+++ b/sj3_rkcv.c
@@ -168,8 +168,8 @@ static u_short HZtbl[95] = {
 #ifdef ADDHK
 setl_hktozh()
 {
-	register int i;
-	register u_short c, zen1;
+	int i;
+	u_short c, zen1;
 	wchar16_t rstr[2];
 	wchar16_t kstr[2];
 	RkTablW16 *rktp, *mktable();
@@ -206,7 +206,7 @@ setl_hktozh()
 
 mkkigou()
 {
-	register int i;
+	int i;
 	wchar16_t rstr[2];
 	wchar16_t kstr[2];
 	RkTablW16 *rktp, *mktable();
@@ -228,7 +228,7 @@ mkkigou()
 sj_addten(prefix, c)
 u_short prefix, c;
 {
-	register u_short c1, cc;
+	u_short c1, cc;
 
 	cc = 0;
 	if ((c == ZEN_DTEN || c == ZEN_HDTEN) &&
@@ -249,8 +249,8 @@ u_short prefix, c;
 sj_han2zen(c)
 u_short c;
 {
-	register int i;
-	register u_short cc;
+	int i;
+	u_short cc;
 
 	if (WcIsHANKAKU(c) && iskana2(c)) {
 		for (i = 0; i < ZKATAn; i++) {
@@ -494,9 +494,9 @@ sj_hantozen(s1, s2, len)
 wchar16_t *s1, *s2;
 int len;
 {
-	register u_short c1, cc, prefix;
-	register wchar16_t c;
-	register int i;
+	u_short c1, cc, prefix;
+	wchar16_t c;
+	int i;
 	int rlen;
 
 	prefix = 0;
@@ -527,8 +527,8 @@ int len;
 sj_zen2han(c)
 u_short c;
 {
-	register int i;
-	register u_short cc;
+	int i;
+	u_short cc;
 	
 	i = ZKATAn;
 	cc = c & MASK;
@@ -761,9 +761,9 @@ sj_zentohan(s1, s2, len)
 wchar16_t *s1, *s2;
 int len;
 {
-	register u_short cc;
-	register wchar16_t c;
-	register int i, rlen;
+	u_short cc;
+	wchar16_t c;
+	int i, rlen;
 
 	rlen = 0;
 	for (i = 0; i < len && *s2 != (wchar16_t) '\0'; i++) {
@@ -812,8 +812,8 @@ wchar16_t c;
 sj_htok(s1, s2)
 wchar16_t *s1, *s2;
 {
-	register wchar16_t cc;
-	register wchar16_t c;
+	wchar16_t cc;
+	wchar16_t c;
 
 	while ((c = *s2++) != (wchar16_t) '\0') {
 		if (WcIsX0208(c)) {
@@ -828,8 +828,8 @@ wchar16_t *s1, *s2;
 sj_ktoh(s1, s2)
 wchar16_t *s1, *s2;
 {
-	register wchar16_t cc;
-	register wchar16_t c;
+	wchar16_t cc;
+	wchar16_t c;
 
 	while ((c = *s2++) != (wchar16_t) '\0') {
 		if (WcIsX0208(c)) {
diff --git a/sj_typedef.h b/sj_typedef.h
index 590ff18..c845430 100644
--- a/sj_typedef.h
+++ b/sj_typedef.h
@@ -43,14 +43,6 @@
 
 #define	TFar
 #define	Far
-#define	Reg1	register
-#define	Reg2	register
-#define	Reg3	register
-#define	Reg4	register
-#define	Reg5	register
-#define	Reg6	register
-#define	Reg7	register
-#define	Reg8	register
 
 #define	Void	void
 #define	Char	char
diff --git a/sjgetchar.c b/sjgetchar.c
index 1a3b9ad..bfad9fe 100644
--- a/sjgetchar.c
+++ b/sjgetchar.c
@@ -125,9 +125,9 @@ output_master()
 	int flags = 0;
 	u_char ctlstuff;
 	int f, stop, ixon, ret;
-	register struct iocblk *ioc;
-	register struct termios *tp;
-	register struct termio *ti;
+	struct iocblk *ioc;
+	struct termios *tp;
+	struct termio *ti;
 	struct tchars	tc, tc1;
 
 	memset((char *)&ctlbuf, '\0', sizeof(ctlbuf));
@@ -256,7 +256,7 @@ output_master()
 
 output_master()
 {
-	register int	n, m;
+	int	n, m;
 	char		outbuf[BUFSIZ];
 	int		f;
 #ifdef SYSV_TERMIOS
@@ -328,9 +328,9 @@ set_eucmode ()
 
 SJ_write (s, n)
 wchar16_t         *s;
-register int	n;
+int	n;
 {
-	register int	val;
+	int	val;
 	wchar16_t wb[BUFFLENGTH];
 	u_char	buff[BUFFLENGTH * 3];
 
@@ -350,7 +350,7 @@ register int	n;
 
 write_stdout(s, n)
 u_char *s;
-register int n;
+int n;
 {
       static u_char knj1st = 0, knj2nd = 0;
 
@@ -385,7 +385,7 @@ int	n;
 {
 	u_char buff[BUFFLENGTH];
 	wchar16_t wcbuff[BUFFLENGTH];
-	register int i, count, remain, c;
+	int i, count, remain, c;
 	size_t wnum;
 	extern int current_locale;
 
diff --git a/sjrc.c b/sjrc.c
index e58a485..d51dcd8 100644
--- a/sjrc.c
+++ b/sjrc.c
@@ -112,7 +112,7 @@ int
 getsjrc ()
 {
 	FILE *fd;
-	register char *p;
+	char *p;
 
 	sjset_code();
 	RCfile[0] = '\0';
@@ -149,9 +149,9 @@ char	*file;
 FILE	*fd;
 {
 	char		line[MAXLINE];
-	register int	w;
+	int	w;
 	struct wordent word[WORDN];
-	register char	*p;
+	char	*p;
 	struct functbl *functp;
 
 	while ((p = fgets (line, MAXLINE, fd)) != NULL) {
@@ -174,7 +174,7 @@ int
 much(s1, s2)
 char *s1, *s2;
 {
-	register char c1, c2;
+	char c1, c2;
 
 	if (s1 == NULL)
 		return 0;
@@ -190,12 +190,12 @@ char *s1, *s2;
 
 int
 getword (s, word)
-register char	*s;
+char	*s;
 struct wordent	word[];
 {
-	register u_char	c, cc;
-	register char *p;
-	register int	i, wcount;
+	u_char	c, cc;
+	char *p;
+	int	i, wcount;
 
 	if (IsDelimitor(*s)) {
 		s++;
diff --git a/sjrc2.c b/sjrc2.c
index b6152b1..b935e5a 100644
--- a/sjrc2.c
+++ b/sjrc2.c
@@ -157,7 +157,7 @@ sjrc_init ()
 
 getsjrc ()
 {
-	register char *p;
+	char *p;
 	char *getenv();
 
 	sjset_code();
@@ -191,7 +191,7 @@ getsjrc ()
 setrc (file)
 char	*file;
 {
-	register wchar16_t	*p;
+	wchar16_t	*p;
 	char		line[MAXLINE];
 	struct wordent	word[WORDN];
 	struct functbl *functp;
@@ -225,8 +225,8 @@ char	*file;
 getsjrk (erase)
 int erase;
 {
-	register char *p;
-	register int i;
+	char *p;
+	int i;
 	char *getenv();
 	char RKfile[LONGLENGTH];
 
@@ -276,7 +276,7 @@ int erase;
 match(s1, s2)
 wchar16_t *s1, *s2;
 {
-	register wchar16_t c1, c2;
+	wchar16_t c1, c2;
 
 	if (s1 == NULL)
 		return(0);
@@ -291,16 +291,16 @@ wchar16_t *s1, *s2;
 
 
 getword (s, word)
-register u_char	*s;
+u_char	*s;
 struct wordent	word[];
 {
-	register u_char	c;
-	register wchar16_t *w;
+	u_char	c;
+	wchar16_t *w;
 	wchar16_t wcbuf[MAXLINE*2];
 	wchar16_t ttmp[MAXLINE];
 	u_char  buf[MAXLINE*2];
-	register u_char *p;
-	register int	i, wcount;
+	u_char *p;
+	int	i, wcount;
 	u_short cc;
 
 	if (IsDelimitor(*s)) {
@@ -490,9 +490,9 @@ struct wordent	word[];
 }
 
 IsGoto (c)
-register u_char	c;
+u_char	c;
 {
-	register int	i;
+	int	i;
 
 	for (i = 0 ; i < goto_num ; i ++) {
 		if (c == goto_code[i])
@@ -512,9 +512,9 @@ struct wordent	word[];
 }
 
 IsTrap (c)
-register u_char	c;
+u_char	c;
 {
-	register int	i;
+	int	i;
 
 	for (i = 0 ; i < trap_num ; i ++) {
 		if (c == trap_code[i])
@@ -524,7 +524,7 @@ register u_char	c;
 }
 
 mode_key (mode)
-register int mode;
+int mode;
 {
 	switch (mode) {
 	case MODE_HALPHA:
@@ -551,9 +551,9 @@ int	Direct = 0;
 set_init_mode (word)
 struct wordent	word[];
 {
-	register Conversion	*cv;
-	register int	i, j;
-	register wchar16_t	*p;
+	Conversion	*cv;
+	int	i, j;
+	wchar16_t	*p;
 
 	cv = GetConversion ();
 	j = 1;
@@ -589,8 +589,8 @@ struct wordent	word[];
 set_defcode (word)
 struct wordent	word[];
 {
-	register wchar16_t *p;
-	register int i;
+	wchar16_t *p;
+	int i;
 	
 	p = word[1].word_str;
 	for (i = 0; i < 5; i++) {
@@ -604,8 +604,8 @@ struct wordent	word[];
 set_muhenkan (word)
 struct wordent	word[];
 {
-	register int	i;
-	register wchar16_t	*p;
+	int	i;
+	wchar16_t	*p;
 
 	p = word[1].word_str;
 	for (i = 0 ; i < 5 ; i ++) {
@@ -619,8 +619,8 @@ struct wordent	word[];
 set_muedit (word)
 struct wordent	word[];
 {
-	register int	i;
-	register wchar16_t	*p;
+	int	i;
+	wchar16_t	*p;
 
 	p = word[1].word_str;
 	for (i = 0 ; i < 5 ; i ++) {
@@ -662,7 +662,7 @@ is_bstudy ()
 
 eval_muhenkan ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	if (muhenkan_toggle && (KEY_ZHIRA != mode_key (cv->Imode)))
@@ -679,7 +679,7 @@ value_muhenkan ()
 set_guide (word)
 struct wordent	word[];
 {
-	register int	i;
+	int	i;
 
 	if (*word[2].word_str == '\0') {
 		return;
@@ -788,8 +788,8 @@ struct wordent	word[];
 set_server(word)
 struct wordent	word[];
 {
-        register int i, j, size;
-        register char *p;
+        int i, j, size;
+        char *p;
         char *sbuf;
         extern char *cur_serv, **serv_list;
 	char host[LONGLENGTH];
@@ -824,8 +824,8 @@ struct wordent	word[];
 set_dict(word)
 struct wordent	word[];
 {
-        register int i, j, size, suffix_len;
-        register char *p;
+        int i, j, size, suffix_len;
+        char *p;
         char *sbuf;
 	char dict[LONGLENGTH];
 
diff --git a/skiphblk.c b/skiphblk.c
index 3720601..97e0f68 100644
--- a/skiphblk.c
+++ b/skiphblk.c
@@ -42,7 +42,7 @@
 Uchar	*skipkstr();
 
 Uchar	*skiphblk(ptr)
-Reg1	Uchar	*ptr;
+Uchar	*ptr;
 {
 	ptr++;
 
diff --git a/stat_conv.c b/stat_conv.c
index d242c3a..98627ec 100644
--- a/stat_conv.c
+++ b/stat_conv.c
@@ -51,9 +51,9 @@ static int	bskey;
 #define SPAN_END		1
 
 save_span (mode)
-register int	mode;
+int	mode;
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	switch (mode) {
@@ -77,7 +77,7 @@ register int	mode;
 
 save_span_p ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	cv->span_p[cv->span_point] = &(cv->out_buf[cv->out_point]);
@@ -86,7 +86,7 @@ save_span_p ()
 
 isspaned ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	if (cv->out_buf[0] != '\0')
@@ -99,7 +99,7 @@ isspaned ()
 
 buffers_clear ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	pointer_clear ();
@@ -111,7 +111,7 @@ buffers_clear ()
 
 pointer_clear ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	cv->ha_point = cv->ha_epoint = 0;
@@ -137,8 +137,8 @@ static SaveSet		save_set0;
 
 StoreSaveSet ()
 {
-	register Conversion	*cv;
-	register SaveSet	*sv;
+	Conversion	*cv;
+	SaveSet	*sv;
 
 	cv = GetConversion ();
 	if (cv->out_point) {
@@ -156,8 +156,8 @@ StoreSaveSet ()
 
 RestoreSaveSet ()
 {
-	register Conversion	*cv;
-	register SaveSet	*sv;
+	Conversion	*cv;
+	SaveSet	*sv;
 
         sv = &save_set0;
 	if (sv->out_point) {
@@ -212,7 +212,7 @@ ClearBuffer ()
 
 SetCflag ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	cv->Cflag = 1;
@@ -220,7 +220,7 @@ SetCflag ()
 
 ClearCflag ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	cv->Cflag = 0;
@@ -228,7 +228,7 @@ ClearCflag ()
 
 IsCflag ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	return (cv->Cflag);
@@ -236,7 +236,7 @@ IsCflag ()
 
 exec_kettei ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 	int		len;
 	wchar16_t		kanji[BUFFLENGTH * 2];
 
@@ -287,7 +287,7 @@ struct wordent  word[];
 
 ChangeBuffMode ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	if (cv->BuffMode == BUFF) {
@@ -301,7 +301,7 @@ ChangeBuffMode ()
 
 BuffYes ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	if (cv->BuffMode == BUFF)
@@ -386,10 +386,10 @@ get_pseq ()
 
 stat_conv ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 	extern int	allways_buff;	
-	register int	inc;	
-        register int    i;
+	int	inc;
+        int    i;
         u_short         svlen;  
 
 	cv = GetConversion ();
@@ -709,8 +709,8 @@ more:
 
 save_obuf()
 {
-        register Conversion     *cv;
-        register int    i, cur;
+        Conversion     *cv;
+        int    i, cur;
 
         cv = GetConversion();
 
@@ -743,8 +743,8 @@ save_obuf()
 
 restore_obuf()
 {
-        register Conversion     *cv;
-        register int    i;
+        Conversion     *cv;
+        int    i;
 
         cv = GetConversion();
 
@@ -767,9 +767,9 @@ restore_obuf()
 }
 
 exec_ctrl(c)
-register int c;
+int c;
 {
-	register Conversion *cv;
+	Conversion *cv;
 	wchar16_t	s[3];
 	extern wchar16_t   pars_seq[];
 	
@@ -802,9 +802,9 @@ register int c;
 }
 
 exec_mode (key)
-register int	key;
+int	key;
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 
 	cv = GetConversion ();
 	if (key == KEY_MUHENKAN)
@@ -819,9 +819,9 @@ register int	key;
 }
 
 toggle_mode (mod)
-register int	mod;
+int	mod;
 {
-	register int	value;
+	int	value;
 
 	switch (mod) {
 	case MODE_ZHIRA:
@@ -844,7 +844,7 @@ register int	mod;
 }
 
 eval_mode (key)
-register int	key;
+int	key;
 {
 	int		mod;
 
@@ -886,7 +886,7 @@ int	len;
 }
 
 is_bsdel (c)
-register int	c;
+int	c;
 {
 	if (is_bs (c) || is_del (c))
 		return (1);
@@ -912,7 +912,7 @@ int	c;
 }
 
 is_bs (c)
-register int	c;
+int	c;
 {
 	if (c == bskey)
 		return (1);
@@ -921,7 +921,7 @@ register int	c;
 }
 
 is_del (c)
-register int	c;
+int	c;
 {
 	if (c == delkey)
 		return (1);
diff --git a/string.c b/string.c
index 23fea1c..31340e9 100644
--- a/string.c
+++ b/string.c
@@ -151,7 +151,7 @@ sj3_str_euctosjis(unsigned char *out, int outlen, unsigned char *in,
 int
 sj3_sjistoeuclen(unsigned char *str, int max)
 {
-	register int len = 0, bytes = 1;
+	int len = 0, bytes = 1;
 
 	if (!max)
 		return 0;
@@ -205,8 +205,8 @@ sj_euc2sjis(unsigned char *s)
 void
 sj_jis2sjis(unsigned char *s)
 {
-	register int    high, low;
-	register int    nh, nl;
+	int    high, low;
+	int    nh, nl;
 
 	high = s[0];
 	low = s[1];
@@ -234,8 +234,8 @@ sj_sjis2euc(unsigned char *s)
 void
 sj_sjis2jis(unsigned char *s)
 {
-	register int byte1, byte2;
-	register unsigned char *sp;
+	int byte1, byte2;
+	unsigned char *sp;
 
 	sp = s;
 	byte1 = *sp++;
diff --git a/toroku.c b/toroku.c
index 61d7112..e581e70 100644
--- a/toroku.c
+++ b/toroku.c
@@ -47,7 +47,7 @@ extern int	keyvalue;
 
 exec_toroku ()
 {
-	register Conversion	*cv;
+	Conversion	*cv;
 	wchar16_t			yomi[YOMILEN+1], kanji[KLEN+1];
 	wchar16_t			*hinshi;
 	int			inc;
@@ -120,8 +120,8 @@ getyomi (yomi, lim, prompt, kanji)
 wchar16_t	*yomi, *prompt, *kanji;
 int	lim;
 {
-	register int	inc, c;
-	register Conversion *cv;
+	int	inc, c;
+	Conversion *cv;
 	int		len;
 	wchar16_t		wtmp[BUFFLENGTH], ytmp[YOMILEN+1], ktmp[KLEN+1];
 	u_char		tmp[BUFFLENGTH];
@@ -191,7 +191,7 @@ int	lim;
 
 gethinshi()
 {
-	register int inc, hcode;
+	int inc, hcode;
 
 	TopGuide(); 
 	printR(WCGtoroku);
@@ -211,7 +211,7 @@ gethinshi()
 getcheck (yomi, kanji, hinshi, prompt)
 wchar16_t	*yomi, *kanji, *hinshi, *prompt;
 {
-	register int	c;
+	int	c;
 	u_char		tmp[BUFFLENGTH + KLEN];
 	extern wchar16_t  *Y;
 	wchar16_t         wtmp[BUFFLENGTH + KLEN];
@@ -270,8 +270,8 @@ getkstr (s, lim, guide)
 wchar16_t	*s, *guide;
 int	lim;
 {
-	register Conversion	*cv;
-	register int		i;
+	Conversion	*cv;
+	int		i;
 	wchar16_t			tmp[BUFFLENGTH * 2];
 	wchar16_t			*p;
 	int			plen, chbun;
@@ -301,10 +301,10 @@ int	lim;
 getbunsetu (kanji, guide)
 wchar16_t	*kanji, *guide;
 {
-	register Conversion	*cv;
-	register int		c;
-	register int		bstart, bend;
-	register int		i;
+	Conversion	*cv;
+	int		c;
+	int		bstart, bend;
+	int		i;
 	u_short			row, col;
 	wchar16_t			*p;
 	int			plen, len;
@@ -402,7 +402,7 @@ wchar16_t	*kanji, *guide;
 
 exec_syoukyo ()
 {
-	register int 	i;
+	int 	i;
 	wchar16_t		yomi[YOMILEN+1], kanji[KLEN+1];
 	wchar16_t		tmp[BUFFLENGTH], tmp2[BUFFLENGTH * 2];
         u_char          ytmp[YOMILEN+1], ktmp[KLEN+1], 
diff --git a/wc16_str.c b/wc16_str.c
index 70c42ab..2653234 100644
--- a/wc16_str.c
+++ b/wc16_str.c
@@ -111,7 +111,7 @@ int
 sj3_wslen16(ws)
 wchar16_t *ws;
 {
-	register int i=0;
+	int i=0;
 
 	if (!ws) return 0;
 
@@ -139,7 +139,7 @@ sj3_wsncmp16(ws1, ws2, n)
 wchar16_t *ws1, *ws2;
 int n;
 {
-	register int i=0;
+	int i=0;
 
 	while ((*ws1 && *ws2) && (*ws1 == *ws2) && (i < n)) {
 		ws1++;
@@ -158,7 +158,7 @@ wchar16_t *
 sj3_wscpy16(ws1, ws2)
 wchar16_t *ws1, *ws2;
 {
-	register wchar16_t *ws;
+	wchar16_t *ws;
 
 	if (!ws2) return NULL;
 	ws = ws1;
@@ -175,8 +175,8 @@ sj3_wsncpy16(ws1, ws2, n)
 wchar16_t *ws1, *ws2;
 int n;
 {
-	register wchar16_t *ws;
-	register int i=0;
+	wchar16_t *ws;
+	int i=0;
 
 	if (!ws2) return NULL;
 	ws = ws1;
@@ -193,7 +193,7 @@ wchar16_t *
 sj3_wscat16(ws1, ws2)
 wchar16_t *ws1, *ws2;
 {
-	register wchar16_t *ws;
+	wchar16_t *ws;
 
 	if (!ws1) return NULL;
 	if (!ws2) return NULL;
@@ -214,7 +214,7 @@ wchar16_t
 sj3_euc2wc16(code)
 unsigned int code;
 {
-	register wchar16_t wc = 0;
+	wchar16_t wc = 0;
 
 	if (((code >> 16) & 0xff) == SS3) {
 		wc = code & 0xff7f;
@@ -231,7 +231,7 @@ wchar16_t
 sj3_sjis2wc16(code)
 unsigned int code;
 {
-	register unsigned short ch;
+	unsigned short ch;
 
 	if ((code >> 8) & 0xff) {
 		ch = sjis2euc(code);
@@ -247,8 +247,8 @@ unsigned int
 sj3_wc2euc16(wc)
 wchar16_t wc;
 {
-	register unsigned int code = 0;
-	register unsigned char tmp;
+	unsigned int code = 0;
+	unsigned char tmp;
 
 	tmp = (wc >> 8) & 0xff;
 	if (tmp) {
@@ -272,7 +272,7 @@ unsigned int
 sj3_wc2sjis16(wc)
 wchar16_t wc;
 {
-	register unsigned int ch;
+	unsigned int ch;
 
 	ch = sj3_wc2euc16(wc);
 	if ((ch >> 16) == SS3) {
@@ -292,9 +292,9 @@ unsigned char *mb;
 wchar16_t *ws;
 int n;
 {
-	register int i = 0;
-	register unsigned int code;
-	register unsigned char c;
+	int i = 0;
+	unsigned int code;
+	unsigned char c;
 	
 	while (*ws && (i < n)) {
 		code = sj3_wc2euc16(*ws);
@@ -337,9 +337,9 @@ unsigned char *mb;
 wchar16_t *ws;
 int n;
 {
-	register int i = 0;
-	register unsigned int code;
-	register unsigned char c;
+	int i = 0;
+	unsigned int code;
+	unsigned char c;
 	
 	while (*ws && (i < n)) {
 		code = sj3_wc2sjis16(*ws);
@@ -372,8 +372,8 @@ wchar16_t *ws;
 unsigned char *mb;
 int n;
 {
-	register int i = 0;
-	register unsigned int code;
+	int i = 0;
+	unsigned int code;
 
 	while (*mb && (i < n)) {
 		if (*mb == SS3) {
@@ -404,8 +404,8 @@ wchar16_t *ws;
 unsigned char *mb;
 int n;
 {
-	register int i = 0;
-	register unsigned int code;
+	int i = 0;
+	unsigned int code;
 
 	while (*mb && (i < n)) {
 		if (issjis1(*mb)) {