diff --git a/src/crt/demo/GNUmakefile b/src/crt/demo/GNUmakefile
index e054dfaab850dd674b28a026211228d7b0785367..b5f18ea19571905193b9f2930ca7beccebc8ceb7 100644
--- a/src/crt/demo/GNUmakefile
+++ b/src/crt/demo/GNUmakefile
@@ -6,4 +6,4 @@ LDFLAGS +=      -L../source/$(LIBODIR) -lcrt $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDF
 
 $(EXEODIR)/crttest: $(EXEODIR) $(OBJS)
 	@echo Linking $@
-	${QUIET}$(CC) $(OBJS) -o $@ $(LDFLAGS) $(MT_LDFLAGS)
+	${QUIET}$(CXX) $(OBJS) -o $@ $(LDFLAGS) $(MT_LDFLAGS)
diff --git a/src/crt/demo/crttest.cpp b/src/crt/demo/crttest.cpp
index 34f83026d4cd64bb520b9eb2cfb2e4148b434c51..7401fb8a465ba5a0d2e871edacc50b0ae34609f0 100644
--- a/src/crt/demo/crttest.cpp
+++ b/src/crt/demo/crttest.cpp
@@ -104,7 +104,6 @@ void dispdacvalues () //display DAC register associated with each palette
 	for (c0=0;c0<16;c0++)
 	 {
 		u2=(unsigned)getpalreg(c0)%u1+(u0/256u)*u1;
-		/* TODO: Next line was disabled! */
 		//getdacreg(u2,&(char)red,&(char)green,&(char)blue);
 		printsf(51,4+c0,0x1f," %.3d        %.2Xh  %.2Xh  %.2Xh ",
 			u2,(unsigned char)red,(unsigned char)green,(unsigned char)blue);
@@ -158,6 +157,7 @@ void dispascii ()
 //this file contains the 8x8 font information for changecharg example
 #include "crazy8.cpp"
 
+extern "C" {
 int main ()
  {
 	int c0,c1,c2,c3;
@@ -597,6 +597,7 @@ WARNING: If you are running this demo from a MS-WINDOWS MS-DOS prompt and\n\
 	crt_gotoxy(0,2);
 	return(0);
  }
+}
 
 //By M rcio Afonso Arimura Fialho
 //http://pessoal.iconet.com.br/jlfialho