From 85b4b1fde2720973cf26e0662575cf191369dc67 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Fri, 11 Sep 1998 15:16:47 +0000
Subject: [PATCH]   * merge fixes

---
 compiler/ppu.pas | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/compiler/ppu.pas b/compiler/ppu.pas
index 537721f72d..c892dd5b0f 100644
--- a/compiler/ppu.pas
+++ b/compiler/ppu.pas
@@ -450,7 +450,7 @@ begin
   readdata(entry,sizeof(tppuentry));
   entrystart:=bufstart+bufidx;
   entryidx:=0;
-  if not entry.id in [mainentryid,subentryid] then
+  if not(entry.id in [mainentryid,subentryid]) then
    begin
      readentry:=iberror;
      error:=true;
@@ -770,7 +770,13 @@ end;
 end.
 {
   $Log$
-  Revision 1.10  1998-08-31 12:26:30  peter
+  Revision 1.11  1998-09-11 15:16:47  peter
+    * merge fixes
+
+  Revision 1.10.2.1  1998/09/11 15:15:04  peter
+    * fixed not in [] bug
+
+  Revision 1.10  1998/08/31 12:26:30  peter
     * m68k and palmos updates from surebugfixes
 
   Revision 1.9  1998/08/17 09:17:51  peter
@@ -813,4 +819,4 @@ end.
   Revision 1.1  1998/05/12 10:56:07  peter
     + the ppufile object unit
 
-}
\ No newline at end of file
+}