diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp
index ab3288706e..80a74952bd 100644
--- a/Core/HLE/sceFont.cpp
+++ b/Core/HLE/sceFont.cpp
@@ -172,8 +172,8 @@ public:
 		MatchQuality match = MATCH_NONE;
 
 #define CHECK_FIELD(f, m) \
-		if (style.##f != 0) { \
-			if (style.##f != style_.##f) { \
+		if (style.f != 0) { \
+			if (style.f != style_.f) { \
 				return MATCH_NONE; \
 			} \
 			if (match < m) { \
@@ -181,8 +181,8 @@ public:
 			} \
 		}
 #define CHECK_FIELD_STR(f, m) \
-		if (style.##f[0] != '\0') { \
-			if (strcmp(style.##f, style_.##f) != 0) { \
+		if (style.f[0] != '\0') { \
+			if (strcmp(style.f, style_.f) != 0) { \
 				return MATCH_NONE; \
 			} \
 			if (match < m) { \
diff --git a/native b/native
index 2b6e004201..3f9301d449 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 2b6e00420195583a60deb9a31f80c39753c0f9ab
+Subproject commit 3f9301d449a9a291b390abe9a2dd0d0d8a71c997