Added a guard to prevent some C++ infrastructure compilation on Arduino because

mike-matera · mike-matera · commit 3a685057376d · 2017-01-12T08:54:01.000-08:00
it might be defined already.
diff --git a/src/abi/abi.cpp b/src/abi/abi.cpp
@@ -28,6 +28,11 @@
 
 extern "C" {
 
+#if defined(ARDUINO)
+        /* Arduino defines some of these.
+	 * There can be link issues if they're redefined
+         */
+#else
 	/* This function is called in the event that a non-overidden
 	 * pure virtual function is called.  The compiler should never
 	 * let that happen.  We get to choose what to do - we will abort
@@ -36,4 +41,5 @@ extern "C" {
 		abort();
 	}
 
+#endif
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,11 @@`
`28`	`28`
`29`	`29`	`extern "C" {`
`30`	`30`
	`31`	`+#if defined(ARDUINO)`
	`32`	`+ /* Arduino defines some of these.`
	`33`	`+ * There can be link issues if they're redefined`
	`34`	`+ */`
	`35`	`+#else`
`31`	`36`	`/* This function is called in the event that a non-overidden`
`32`	`37`	`* pure virtual function is called. The compiler should never`
`33`	`38`	`* let that happen. We get to choose what to do - we will abort`
`@@ -36,4 +41,5 @@ extern "C" {`
`36`	`41`	`abort();`
`37`	`42`	`}`
`38`	`43`
	`44`	`+#endif`
`39`	`45`	`}`