From 7825ab7f0fb3d445eb3ab83a2be5cb9d4b31192f Mon Sep 17 00:00:00 2001
From: skimo <skimo>
Date: Sun, 13 May 2001 09:05:06 +0000
Subject: [PATCH] Change C++ style comments. Add cast.

---
 common/conv.c | 5 ++---
 common/log.c  | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/conv.c b/common/conv.c
index 366b3dfc..550ab084 100644
--- a/common/conv.c
+++ b/common/conv.c
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: conv.c,v 1.14 2001/05/12 15:16:05 skimo Exp $ (Berkeley) $Date: 2001/05/12 15:16:05 $";
+static const char sccsid[] = "$Id: conv.c,v 1.15 2001/05/13 09:05:06 skimo Exp $ (Berkeley) $Date: 2001/05/13 09:05:06 $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -194,7 +194,7 @@ default_int2char(SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw,
 	char *bp = buffer;						\
 	while (len != 0) {						\
 	    size_t outleft = cw->blen1 - offset;			\
-	    char *obp = cw->bp1 + offset;			    	\
+	    char *obp = (char *)cw->bp1 + offset;		    	\
 	    if (cw->blen1 < offset + MB_CUR_MAX) {		    	\
 		nlen += 256;						\
 		BINC_RET(NULL, cw->bp1, cw->blen1, nlen);		\
@@ -254,7 +254,6 @@ err:
     return 1;
 }
 
-//#ifdef HAVE_NCURSESW
 #ifdef HAVE_ADDNWSTR
 int 
 default_int2disp (SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw, 
diff --git a/common/log.c b/common/log.c
index 6422bcb8..6af2463b 100644
--- a/common/log.c
+++ b/common/log.c
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: log.c,v 10.21 2001/01/01 20:26:47 skimo Exp $ (Berkeley) $Date: 2001/01/01 20:26:47 $";
+static const char sccsid[] = "$Id: log.c,v 10.22 2001/05/13 09:05:06 skimo Exp $ (Berkeley) $Date: 2001/05/13 09:05:06 $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -109,7 +109,7 @@ log_init(sp, ep)
 	}
 
 	ep->l_win = NULL;
-	//LOCK_INIT(sp->wp, ep);
+	/*LOCK_INIT(sp->wp, ep);*/
 
 	return (0);
 }
@@ -129,7 +129,7 @@ log_end(sp, ep)
 	 * !!!
 	 * ep MAY NOT BE THE SAME AS sp->ep, DON'T USE THE LATTER.
 	 */
-	//LOCK_END(sp->wp, ep);
+	/*LOCK_END(sp->wp, ep);*/
 	if (ep->log != NULL) {
 		(void)(ep->log->close)(ep->log,DB_NOSYNC);
 		ep->log = NULL;
-- 
2.11.4.GIT