diff --git a/libunwind/src/assembly.h b/libunwind/src/assembly.h
index 9554ca8cc62b..fb07d04071af 100644
--- a/libunwind/src/assembly.h
+++ b/libunwind/src/assembly.h
@@ -209,7 +209,7 @@
 #if defined(__powerpc64__)
 #define VBYTE_LEN 8
 #define CSECT_ALIGN 3
-#elif defined(__ppc__)
+#else
 #define VBYTE_LEN 4
 #define CSECT_ALIGN 2
 #endif
diff --git a/libunwind/src/config.h b/libunwind/src/config.h
index 7fd6b7334053..e751860bd936 100644
--- a/libunwind/src/config.h
+++ b/libunwind/src/config.h
@@ -60,13 +60,13 @@
   #define _LIBUNWIND_EXPORT
   #define _LIBUNWIND_HIDDEN
 #else
-#if !defined(__ELF__) && !defined(__MACH__) && !defined(_AIX)
-#define _LIBUNWIND_EXPORT __declspec(dllexport)
-#define _LIBUNWIND_HIDDEN
-#else
-#define _LIBUNWIND_EXPORT __attribute__((visibility("default")))
-#define _LIBUNWIND_HIDDEN __attribute__((visibility("hidden")))
-#endif
+  #if !defined(__ELF__) && !defined(__MACH__) && !defined(_AIX)
+    #define _LIBUNWIND_EXPORT __declspec(dllexport)
+    #define _LIBUNWIND_HIDDEN
+  #else
+    #define _LIBUNWIND_EXPORT __attribute__((visibility("default")))
+    #define _LIBUNWIND_HIDDEN __attribute__((visibility("hidden")))
+  #endif
 #endif
 
 #define STR(a) #a