Amiga: drop redundant 'either windowtype' guards

Six if(WINVERS_AMIV || WINVERS_AMII) sites are always true with
amitty.c gone.

sys/amiga/winamenu.c

@@ -360,10 +360,8 @@ DoMenuScroll(int win, int blocking, int how, menu_item **retmip)
         }
         nw->Height = min(ysize, amiIDisplay->ypix - nw->TopEdge);
 
-        if (WINVERS_AMIV || WINVERS_AMII) {
         /* Make sure we are using the correct hook structure */
         nw->Extension = cw->wintags;
-        }
 
         /* Now, open the window */
         w = cw->win = OpenShWindow((void *) nw);
@@ -535,7 +533,6 @@ DoMenuScroll(int win, int blocking, int how, menu_item **retmip)
                  * amii_cl_end if window shrinks and columns decrease.
                  */
 
-                if (WINVERS_AMII || WINVERS_AMIV) {
                 amii_setfillpens(w, cw->type);
                 SetDrMd(w->RPort, JAM2);
                 x2 = w->Width - w->BorderRight;
@@ -549,7 +546,6 @@ DoMenuScroll(int win, int blocking, int how, menu_item **retmip)
                 y1 = y1 - w->IFont->tf_YSize;
                 RectFill(w->RPort, x1, y1, x2, y2);
                 RefreshWindowFrame(w);
-                }
 
                 /* Make the prop gadget the right size and place */
 

sys/amiga/winfuncs.c

@@ -538,8 +538,6 @@ amii_create_nhwindow(int type)
     wd = (struct amii_WinDesc *) alloc(sizeof(struct amii_WinDesc));
     memset(wd, 0, sizeof(struct amii_WinDesc));
 
-    /* Both, since user may have changed the pen settings so respect those */
-    if (WINVERS_AMII || WINVERS_AMIV) {
     /* Special backfill for these types of layers */
     switch (type) {
     case NHW_MESSAGE:
@@ -561,7 +559,6 @@ amii_create_nhwindow(int type)
         }
         break;
     }
-    }
 
     /* Don't open MENU or TEXT windows yet */
 

sys/amiga/winreq.c

@@ -108,13 +108,11 @@ EditColor(void)
         ((struct PropInfo *) Col_RedPen.SpecialInfo)->Flags |= PROPNEWLOOK;
         ((struct PropInfo *) Col_GreenPen.SpecialInfo)->Flags |= PROPNEWLOOK;
     }
-    if (WINVERS_AMIV || WINVERS_AMII) {
     Col_NewWindowStructure1.Extension = wintags;
     Col_NewWindowStructure1.Flags |= WFLG_NW_EXTENDED;
     fillhook.h_Entry = (void *) &LayerFillHook;
     fillhook.h_Data = (void *) -2;
     fillhook.h_SubEntry = 0;
-    }
 
     nw = OpenWindow((void *) &Col_NewWindowStructure1);
 
@@ -360,13 +358,11 @@ EditClipping(void)
         ((struct PropInfo *) ClipXCLIP.SpecialInfo)->Flags |= PROPNEWLOOK;
         ((struct PropInfo *) ClipYCLIP.SpecialInfo)->Flags |= PROPNEWLOOK;
     }
-    if (WINVERS_AMIV || WINVERS_AMII) {
     ClipNewWindowStructure1.Extension = wintags;
     ClipNewWindowStructure1.Flags |= WFLG_NW_EXTENDED;
     fillhook.h_Entry = (void *) &LayerFillHook;
     fillhook.h_Data = (void *) -2;
     fillhook.h_SubEntry = 0;
-    }
 
     nw = OpenWindow((void *) &ClipNewWindowStructure1);
 
@@ -807,13 +803,11 @@ getlind(const char *prompt, char *bufp, const char *dflt)
         once = 1;
     }
 
-    if (WINVERS_AMIV || WINVERS_AMII) {
     StrWindow.Extension = wintags;
     StrWindow.Flags |= WFLG_NW_EXTENDED;
     fillhook.h_Entry = (void *) &LayerFillHook;
     fillhook.h_Data = (void *) -2;
     fillhook.h_SubEntry = 0;
-    }
 
     if ((cwin = OpenWindow((void *) &StrWindow)) == NULL) {
         return;