Merge pull request #447 from Jafaral/clang-pragma

fix gcc warnings by guarding clang pragma

src/h/rmacros.h

@@ -222,12 +222,18 @@
 /*
  * Block references that do not use (the address of) a particular field.
  */
+#ifdef __clang__
 #define Blk(p,u) \
   _Pragma("clang diagnostic push")                                  \
   _Pragma("clang diagnostic ignored \"-Wunused-value\"")            \
   ((((!ValidPtr(p)) || ((p)->u.title != T_ ## u)) ?                 \
       (heaperr("invalid block",p, T_ ## u) , 1) : 1), &((p)->u))    \
   _Pragma("clang diagnostic pop")
+#else
+#define Blk(p,u) \
+  ((((!ValidPtr(p)) || ((p)->u.title != T_ ## u)) ?                 \
+      (heaperr("invalid block",p, T_ ## u) , 1) : 1), &((p)->u))
+#endif
 
 /*
  * Block references for generic (set|table) code.

uni/3d/viewer/Makefile

@@ -1,32 +1,21 @@
 BASE=../../..
 include $(BASE)/Makedefs.uni
 
-UC=$(UNICON)
-UFLAGS=-c -u
-
 UFILES= u3dviewer.u world.u subwin3d.u
 
 TARGET=u3dview
 
 all: $(UFILES) $(TARGET)
 
-pure:
-	$(MAKE) clean
-	$(MAKE) all
 
 $(TARGET): $(UFILES)
 	$(UC) -G -o $(TARGET) $(UFILES)
 
-# u3dview.u: u3dview.icn
-
-%.u:	%.icn
-	 $(UC) $(UFLAGS) $<
-
 zip:
-	 zip lib3d.zip makefile *.icn
+	 zip u3dviewer.zip Makefile *.icn
 
 clean:
-	$(DEL) $(TARGET) $(UFILES)  uniclass.dir uniclass.pag
+	$(RM) $(TARGET) $(UFILES) u3dviewer.zip uniclass.dir uniclass.pag