commit 05f5d46b6368978fd22cfbea7155e983b0faa9a7
from: rsc <devnull@localhost>
date: Fri Feb 17 18:21:29 2006 UTC

make compile

commit - eacea5a0647ba94a9d5906b2b4b7b5761bcef6e9
commit + 05f5d46b6368978fd22cfbea7155e983b0faa9a7
blob - 5c9df7d9bc798e4fd28a1d3d4b1233efbbe3be9c
blob + 9a8a7f678f75b0ce0b1f34912522db1211fa42e6
--- src/cmd/mpm/mkfile
+++ src/cmd/mpm/mkfile
@@ -12,7 +12,8 @@ HFILES=misc.h\
 LD=g++
 
 <$PLAN9/src/mkone
-CFLAGS=
+CC=g++
+CFLAGS=-c
 
 slug.$O:	slug.h
 range.$O:	range.h slug.h
blob - 401035a52d54d51a11be0ece4323f194ad376d4f
blob + 54994cdd19bcfd600ffb8ae4c622ceb5b9149576
--- src/cmd/mpm/range.h
+++ src/cmd/mpm/range.h
@@ -18,6 +18,7 @@ class range {
   public:
 	range()		{ first = 0; accumV = 0; }
 	range(slug *p)	{ first = p; accumV = 0; }
+	virtual ~range() { }
 	char	*headstr()		{
 		return first ? first->headstr() : (char*)""; }
 	char	*typename()		{ return first->typename(); }
@@ -307,6 +308,7 @@ class generator {
 
 extern stream	ptlist, btlist;		// page titles
 
+#undef INFINITY
 #define INFINITY 1000001
 
 // A queue is a distinguished kind of stream.
blob - b4ae0ff84ccbce1f076890f69113287ded8a919d
blob + 92d48db30ce25061018b9afe4a5c410fa0ed9d4e
--- src/cmd/mpm/slug.cc
+++ src/cmd/mpm/slug.cc
@@ -1,7 +1,6 @@
 #include	"misc.h"
 #include	"slug.h"
 #include	<math.h>
-#include	<utf.h>
 
 static char	*bufptr(int);
 
@@ -147,6 +146,19 @@ static void adds(char *s)
 {
 	for (char *p = s; *p; p++)
 		addc(*p);
+}
+
+static int fullrune(char *c, int n)
+{
+	if(n <= 0)
+		return 0;
+	if(n>=1 && (unsigned char)c[0] < 0x80)
+		return 1;
+	if(n>=2 && (unsigned char)c[0] < 0xE0)
+		return 1;
+	if(n>=3)
+		return 1;
+	return 0;
 }
 
 static char *getutf(FILE *fp)	// get 1 utf-encoded char (might be multiple bytes)