Apply fixes from stbrumme#21

Apply fixes from stbrumme#20

Author: karurochori

src/crc32.cpp

@@ -322,15 +322,15 @@ namespace
   {
 #if defined(__GNUC__) || defined(__clang__)
     return __builtin_bswap32(x);
-#endif
-#ifdef MSC_VER
+#elif defined(_MSC_VER)
     return _byteswap_ulong(x);
-#endif
+#else
 
     return (x >> 24) |
           ((x >>  8) & 0x0000FF00) |
           ((x <<  8) & 0x00FF0000) |
            (x << 24);
+#endif
   }
 }
 

src/keccak.cpp

@@ -59,10 +59,9 @@ namespace
   {
 #if defined(__GNUC__) || defined(__clang__)
     return __builtin_bswap64(x);
-#endif
-#ifdef _MSC_VER
+#elif _MSC_VER
     return _byteswap_uint64(x);
-#endif
+#else
 
     return  (x >> 56) |
            ((x >> 40) & 0x000000000000FF00ULL) |
@@ -72,6 +71,7 @@ namespace
            ((x << 24) & 0x0000FF0000000000ULL) |
            ((x << 40) & 0x00FF000000000000ULL) |
             (x << 56);
+#endif
   }
 
 

src/md5.cpp

@@ -65,15 +65,15 @@ namespace
   {
 #if defined(__GNUC__) || defined(__clang__)
     return __builtin_bswap32(x);
-#endif
-#ifdef MSC_VER
+#elif defined(_MSC_VER)
     return _byteswap_ulong(x);
-#endif
+#else
 
     return (x >> 24) |
           ((x >>  8) & 0x0000FF00) |
           ((x <<  8) & 0x00FF0000) |
            (x << 24);
+#endif
   }
 #endif
 }

src/sha1.cpp

@@ -61,15 +61,15 @@ namespace
   {
 #if defined(__GNUC__) || defined(__clang__)
     return __builtin_bswap32(x);
-#endif
-#ifdef MSC_VER
+#elif defined(_MSC_VER)
     return _byteswap_ulong(x);
-#endif
+#else
 
     return (x >> 24) |
           ((x >>  8) & 0x0000FF00) |
           ((x <<  8) & 0x00FF0000) |
            (x << 24);
+#endif
   }
 }
 

src/sha3.cpp

@@ -61,10 +61,9 @@ namespace
   {
 #if defined(__GNUC__) || defined(__clang__)
     return __builtin_bswap64(x);
-#endif
-#ifdef _MSC_VER
+#elif defined(_MSC_VER)
     return _byteswap_uint64(x);
-#endif
+#else
 
     return  (x >> 56) |
            ((x >> 40) & 0x000000000000FF00ULL) |
@@ -74,6 +73,7 @@ namespace
            ((x << 24) & 0x0000FF0000000000ULL) |
            ((x << 40) & 0x00FF000000000000ULL) |
             (x << 56);
+#endif
   }