Updated fcpp.

3rdparty/fcpp/cpp.h

@@ -33,8 +33,10 @@
  * In general, definitions in this file should not be changed.
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #ifndef fpp_toupper
 #define fpp_toupper(c) ((c) + ('A' - 'a'))
 #endif /* no fpp_toupper */

3rdparty/fcpp/cpp1.c

@@ -22,11 +22,12 @@ SOFTWARE.
 
 #include <stdio.h>
 #include <ctype.h>
+
 #include "cppdef.h"
 #include "cpp.h"
 
 #if defined(AMIGA)
-#include        <dos.h>
+#include <dos.h>
 #if defined(SHARED)
 int _OSERR=0;
 char *_ProgramName="junk";

3rdparty/fcpp/cpp2.c

@@ -19,10 +19,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
-#include    <stdio.h>
-#include    <ctype.h>
-#include    "cppdef.h"
-#include    "cpp.h"
+#include <stdio.h>
+#include <ctype.h>
+
+#include "cppdef.h"
+#include "cpp.h"
 
 #ifdef _AMIGA
 #include <proto/dos.h>

3rdparty/fcpp/cpp3.c

@@ -19,11 +19,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
-#include        <stdio.h>
-#include        <ctype.h>
-#include        <time.h>        /*OIS*0.92*/
-#include        "cppdef.h"
-#include        "cpp.h"
+#include <stdio.h>
+#include <ctype.h>
+#include <time.h> /*OIS*0.92*/
+
+#include "cppdef.h"
+#include "cpp.h"
 
 ReturnCode fpp_openfile(struct Global *global, char *filename)
 {
@@ -274,7 +275,7 @@ int fpp_dooptions(struct Global *global, struct fppTag *tags)
       global->allowincludelocal=(tags->data?1:0);
       break;
     case FPPTAG_FILEOPENFUNC:
-//      global->openfile = (FILE* (*)(char *,char *))tags->data;
+      global->openfile = (FILE* (*)(char *,char *))tags->data;
       break;
     default:
       fpp_cwarn(global, WARN_INTERNAL_ERROR, NULL);

3rdparty/fcpp/cpp4.c

@@ -19,10 +19,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
-#include	<stdio.h>
-#include	<ctype.h>
-#include	"cppdef.h"
-#include	"cpp.h"
+#include <stdio.h>
+#include <ctype.h>
+
+#include "cppdef.h"
+#include "cpp.h"
 
 INLINE FILE_LOCAL ReturnCode fpp_checkparm(struct Global *, int, DEFBUF *, int);
 INLINE FILE_LOCAL ReturnCode fpp_stparmscan(struct Global *, int);

3rdparty/fcpp/cpp5.c

@@ -21,6 +21,7 @@ SOFTWARE.
 ******************************************************************************/
 #include <stdio.h>
 #include <ctype.h>
+
 #include "cppdef.h"
 #include "cpp.h"
 

3rdparty/fcpp/makefile

@@ -26,58 +26,33 @@
 
 # Frexx PreProcessor Makefile
 
-#HOST		=-tp -B/home/danne/code/cpp/ -Wp\,-Q\,-Dunix\,-Ddpc\,-DAIX
-#DEFINES    = -Dunix -Dpdc -DAIX -DUNIX -DDEBUG
-DEFINES     = -Dunix -Dpdc -DUNIX -DDEBUG
-DEBUGFLAG	= -g
-LD	        = ld
-LDFLAGS		=
-LIB         = libfpp.a
-CPP         = fpp
-FILECPP     = fcpp
-TEMP		= templib.o
-EXPORT		= fpp.exp
-CC          = gcc
-CFLAGS		= $(DEBUGFLAG) $(DEFINES)
-AR      	= ar
-ARFLAGS 	= rv
-.SUFFIXES: .o .c .c~ .h .h~ .a .i
-OBJS 		= cpp1.o cpp2.o cpp3.o cpp4.o cpp5.o cpp6.o
-FILEOBJS 		= cpp1.o cpp2.o cpp3.o cpp4.o cpp5.o cpp6.o usecpp.o
+DEFINES   = -Dunix -Dpdc -DUNIX -DDEBUG
+DEBUGFLAG = -g
+LIB       = libfpp.a
+CPP       = fpp
+FILECPP   = fcpp
+CFLAGS    = $(DEBUGFLAG) $(DEFINES)
+ARFLAGS   = rv
+O         = o
+OBJS      = cpp1.$(O) cpp2.$(O) cpp3.$(O) cpp4.$(O) cpp5.$(O) cpp6.$(O)
+FILEOBJS  = $(OBJS) usecpp.$(O)
 
-# ** compile cpp
-#
-
-#all: $(LIB) $(CPP)
 all: $(FILECPP)
 
-$(LIB) : $(OBJS) $(EXPORT)
-	$(LD) $(OBJS) -o $(TEMP) -bE:$(EXPORT) -bM:SRE -T512 -H512 -lc
-	rm -f $(LIB)
-	$(AR) $(ARFLAGS) $(LIB) $(TEMP)
-	rm $(TEMP)
+$(LIB) : $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 
-$(CPP) : usecpp.c
-	$(CC) $(CFLAGS) -o $(CPP) usecpp.c -L. -lfpp
+$(CPP) : usecpp.c $(LIB)
+	$(CC) $(CFLAGS) -o $@ $< -L. -lfpp
 
 $(FILECPP) : $(FILEOBJS)
 	$(CC) $(FILEOBJS) -o $(FILECPP)
 
-.c.o:
+.c.$(O):
 	$(CC) $(CFLAGS) -c $<
 
-cpp1.o:cpp1.c
-cpp2.o:cpp2.c
-cpp3.o:cpp3.c
-cpp4.o:cpp4.c
-cpp5.o:cpp5.c
-cpp6.o:cpp6.c
-memory.o:memory.c
-
-usecpp.o:usecpp.c
-
 clean :
-	rm -f *.o $(FILECPP)
+	rm -f *.$(O) $(FILECPP) $(LIB) $(CPP)
 
 tgz:
 	rm -f makefile*~

3rdparty/fcpp/usecpp.c

@@ -276,7 +276,7 @@ char GetPrefs(struct fppTag **tagptr, char **string)
   unsigned  Length_U;
   char     *PrefsBuffer_PC;
   char ret= 0;
-  char *environ;
+  char *env;
 
   *string = NULL;
 
@@ -301,8 +301,8 @@ char GetPrefs(struct fppTag **tagptr, char **string)
     }
   }
 
-  if(environ = getenv("CPP_PREFS")) {
-    ret= !DoString(tagptr, environ);
+  if((env = getenv("CPP_PREFS"))) {
+    ret= !DoString(tagptr, env);
     if(ret && *string)
       free( *string );
   }
@@ -559,7 +559,7 @@ int SetOptions(int argc, char **argv, struct fppTag **tagptr)
 	  fprintf(stderr,
 		  "Usage: cpp [options] [infile [outfile] ]\n\n"
 		  "The following options are valid:\n"
-		  "  -B\tNo mahcine specific built-in symbols\n"
+		  "  -B\tNo machine specific built-in symbols\n"
 		  "  -b\tOutput any parentheses, brace or bracket unbalance\n"
 		  "  -C\tWrite source file comments to output\n"
 		  "  -D\tDefine a symbol with the given (optional) value \"symbol[=value]\"\n"

scripts/shaderc.lua

@@ -362,6 +362,7 @@ project "fcpp"
 	configuration { "not vs*" }
 		buildoptions {
 			"-Wno-implicit-fallthrough",
+			"-Wno-incompatible-pointer-types",
 			"-Wno-parentheses-equality",
 		}