Fix '#undef' handling

lang/cem/cpp.ansi/Parameters

@@ -36,7 +36,7 @@
 
 
 !File: botch_free.h
-#undef BOTCH_FREE	1	/* botch freed memory, as a check	*/
+/*#define BOTCH_FREE	1	/* botch freed memory, as a check	*/
 
 
 !File: debug.h
@@ -52,7 +52,7 @@
 
 
 !File: inputtype.h
-#undef INP_READ_IN_ONE	1	/* read input file in one.  */
+/*#define INP_READ_IN_ONE	1	/* read input file in one.  */
 				/* If defined, we cannot read from a pipe */
 
 

lang/cem/cpp.ansi/domacro.c

@@ -478,7 +478,10 @@ do_undef(argstr)
 		} /* else: don't complain */
 		if (!argstr){
 			free(str);
-			SkipToNewLine();
+			if (SkipToNewLine()) {
+				if (!options['o'])
+					strict("garbage following #else");
+			}
 		}
 	}
 	else