Added "#ifndef CORE_MOCK" around conflicted area.

Author: mhightower83

cores/esp8266/core_esp8266_features.h

@@ -50,6 +50,7 @@
 // level 15 will disable ALL interrupts,
 // level 0 will enable ALL interrupts,
 //
+#ifndef CORE_MOCK
 #define xt_rsil(level) (__extension__({uint32_t state; __asm__ __volatile__("rsil %0," __STRINGIFY(level) : "=a" (state) :: "memory"); state;}))
 #define xt_wsr_ps(state)  __asm__ __volatile__("wsr %0,ps; isync" :: "a" (state) : "memory")
 
@@ -58,5 +59,6 @@ inline uint32_t esp_get_cycle_count() {
   __asm__ __volatile__("rsr %0,ccount":"=a"(ccount));
   return ccount;
 }
+#endif // not CORE_MOCK
 
 #endif