From: Alex Smith <ais523@bham.ac.uk>
Date: Tue, 8 Jul 2008 00:17:59 +0000 (-0400)
Subject: Cfunge patches are now merged into the upstream
X-Git-Tag: 0.29~199
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=c6ce4ebe9355ea11d1510f5d732dd0afc99e0883;p=intercal.git

Cfunge patches are now merged into the upstream
---

diff --git a/etc/cftoec.sh b/etc/cftoec.sh
index c1dbfc3..9d75a89 100644
--- a/etc/cftoec.sh
+++ b/etc/cftoec.sh
@@ -40,8 +40,9 @@ CFLAGS="--std=c99 -DUSE32 -DDISABLE_GC -DFUNGE_EXTERNAL_LIBRARY -D_POSIX_C_SOURC
 echo "   " Duplicating cfunge source tree so that it can be modified...
 cp -r $CFUNGEPATH/src $CFUNGEPATH/lib .
 
-echo "   " Patching cfunge source tree for use with C-INTERCAL...
-patch -p0 < ../cfunge.patch
+# Comment these lines back in if patching is needed
+# echo "   " Patching cfunge source tree for use with C-INTERCAL...
+# patch -p0 < ../cfunge.patch
 
 echo "   " Adding the IFFI fingerprint...
 cp -r ../IFFI ../IFFI.spec src/fingerprints
diff --git a/etc/cfunge.patch b/etc/cfunge.patch
deleted file mode 100644
index 5e145b1..0000000
--- a/etc/cfunge.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-=== modified file 'src/global.h'
---- src/global.h	2008-06-30 15:54:08 +0000
-+++ src/global.h	2008-07-05 17:14:43 +0000
-@@ -158,7 +158,9 @@
- 
- 
- /// Handprint: CFUN
--#define FUNGEHANDPRINT 0x4346554e
-+#ifndef FUNGEHANDPRINT
-+#  define FUNGEHANDPRINT 0x4346554e
-+#endif
- /// Version, for -V.
- #define APPVERSION  "0.2.1-pre2"
- /// For y instruction.
-
---- src/funge-space/funge-space.c	2008-07-06 00:49:23.000000000 +0100
-+++ src/funge-space/funge-space.c	2008-07-06 18:09:22.000000000 +0100
-@@ -312,7 +312,7 @@
- 	// Row in fungespace
- 	FUNGEVECTORTYPE y = 0;
- 	FUNGEVECTORTYPE x = 0;
--	size_t linelen = strlen(program) + 1;
-+	size_t linelen = strlen(program);
- 
- 	for (size_t i = 0; i < linelen; i++) {
- 		switch (program[i]) {