Merge pull request #333 from rgiese/master

Fix compiler errors thrown by recent Particle cloud compiler updates
adafruit · Feb 1, 2021 · 3dab29c · 3dab29c
2 parents b53849e + 347b134
commit 3dab29c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Adafruit_SPITFT.cpp b/Adafruit_SPITFT.cpp
@@ -560,7 +560,7 @@ void Adafruit_SPITFT::initSPI(uint32_t freq, uint8_t spiMode) {
     if (
 #if !defined(SPI_INTERFACES_COUNT)
         1
-#endif
+#else
 #if SPI_INTERFACES_COUNT > 0
         (hwspi._spi == &SPI)
 #endif
@@ -579,6 +579,7 @@ void Adafruit_SPITFT::initSPI(uint32_t freq, uint8_t spiMode) {
 #if SPI_INTERFACES_COUNT > 5
         || (hwspi._spi == &SPI5)
 #endif
+#endif // end SPI_INTERFACES_COUNT
     ) {
       hwspi._spi->begin();
     }

diff --git a/Adafruit_SPITFT.h b/Adafruit_SPITFT.h
@@ -154,6 +154,10 @@ class Adafruit_SPITFT : public Adafruit_GFX {
                   int8_t wr, int8_t dc, int8_t cs = -1, int8_t rst = -1,
                   int8_t rd = -1);
 
+  // DESTRUCTOR ----------------------------------------------------------
+
+  ~Adafruit_SPITFT(){};
+
   // CLASS MEMBER FUNCTIONS ----------------------------------------------
 
   // These first two functions MUST be declared by subclasses: