Rename engine/src/block.h -> MCBlock.h to avoid a namespace conflict with an OSX header

livecodefraser · livecodefraser · commit a77446b8e7f5 · 2015-03-31T16:25:01.000+01:00
diff --git a/engine/engine-sources.gypi b/engine/engine-sources.gypi
@@ -183,7 +183,7 @@
 			
 			# Group "Core - Objects"
 			'src/aclip.h',
-			'src/block.h',
+			'src/MCBlock.h',
 			'src/button.h',
 			'src/card.h',
 			'src/cardlst.h',
diff --git a/engine/src/MCBlock.h b/engine/src/MCBlock.h
diff --git a/engine/src/block.cpp b/engine/src/block.cpp
@@ -29,7 +29,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "image.h"
 #include "paragraf.h"
 #include "line.h"
-#include "block.h"
+#include "MCBlock.h"
 #include "util.h"
 #include "context.h"
 #include "unicode.h"
diff --git a/engine/src/field.cpp b/engine/src/field.cpp
@@ -30,7 +30,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "cdata.h"
 #include "scrolbar.h"
 #include "field.h"
-#include "block.h"
+#include "MCBlock.h"
 #include "paragraf.h"
 #include "mcerror.h"
 #include "util.h"
diff --git a/engine/src/fieldf.cpp b/engine/src/fieldf.cpp
@@ -27,7 +27,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "scrolbar.h"
 #include "button.h"
 #include "field.h"
-#include "block.h"
+#include "MCBlock.h"
 #include "paragraf.h"
 #include "sellst.h"
 #include "undolst.h"
diff --git a/engine/src/fieldh.cpp b/engine/src/fieldh.cpp
@@ -29,7 +29,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "mcerror.h"
 #include "execpt.h"
 #include "util.h"
-#include "block.h"
+#include "MCBlock.h"
 #include "line.h"
 #include "globals.h"
 #include "unicode.h"
diff --git a/engine/src/fields.cpp b/engine/src/fields.cpp
@@ -28,7 +28,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "card.h"
 #include "cdata.h"
 #include "field.h"
-#include "block.h"
+#include "MCBlock.h"
 #include "paragraf.h"
 #include "scrolbar.h"
 #include "mcerror.h"
diff --git a/engine/src/fieldstyledtext.cpp b/engine/src/fieldstyledtext.cpp
@@ -29,7 +29,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "mcerror.h"
 #include "execpt.h"
 #include "util.h"
-#include "block.h"
+#include "MCBlock.h"
 
 #include "globals.h"
 #include "unicode.h"
diff --git a/engine/src/fonttable.cpp b/engine/src/fonttable.cpp
@@ -23,7 +23,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "filedefs.h"
 
 #include "object.h"
-#include "block.h"
+#include "MCBlock.h"
 #include "button.h"
 #include "graphic.h"
 #include "group.h"
diff --git a/engine/src/line.cpp b/engine/src/line.cpp
@@ -23,7 +23,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #include "field.h"
 #include "paragraf.h"
-#include "block.h"
+#include "MCBlock.h"
 #include "line.h"
 #include "context.h"
 #include "uidc.h"
diff --git a/engine/src/osxfield.cpp b/engine/src/osxfield.cpp
@@ -29,7 +29,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "mcerror.h"
 #include "execpt.h"
 #include "util.h"
-#include "block.h"
+#include "MCBlock.h"
 
 #include "globals.h"
 #include "unicode.h"
diff --git a/engine/src/paragraf.cpp b/engine/src/paragraf.cpp
@@ -24,7 +24,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "mcio.h"
 
 #include "stack.h"
-#include "block.h"
+#include "MCBlock.h"
 #include "line.h"
 #include "field.h"
 #include "paragraf.h"
diff --git a/engine/src/paragrafattr.cpp b/engine/src/paragrafattr.cpp
@@ -24,7 +24,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "mcio.h"
 
 #include "stack.h"
-#include "block.h"
+#include "MCBlock.h"
 #include "line.h"
 #include "field.h"
 #include "paragraf.h"
diff --git a/engine/src/pickle.cpp b/engine/src/pickle.cpp
@@ -38,7 +38,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "aclip.h"
 #include "cpalette.h"
 #include "vclip.h"
-#include "block.h"
+#include "MCBlock.h"
 #include "cdata.h"
 #include "styledtext.h"
 #include "globals.h"
diff --git a/engine/src/styledtext.cpp b/engine/src/styledtext.cpp
@@ -23,7 +23,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "mcio.h"
 
 #include "stack.h"
-#include "block.h"
+#include "MCBlock.h"
 #include "line.h"
 #include "field.h"
 #include "paragraf.h"
