Merge pull request #548 from Jcw87/other_compilers

Improve compatibility with other compilers

src/m_Do/m_Do_DVDError.cpp

@@ -6,11 +6,12 @@
 #include "m_Do/m_Do_DVDError.h"
 #include "JSystem/JKernel/JKRThread.h"
 #include "dolphin/os/OS.h"
+#include "global.h"
 #include "m_Do/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_ext.h"
 
 OSThread DvdErr_thread;
-u8 DvdErr_stack[0x1000] __attribute__((aligned(32)));
+u8 DvdErr_stack[0x1000] ALIGN_DECL(32);
 
 static OSAlarm Alarm;
 bool mDoDvdErr_initialized;

src/m_Do/m_Do_MemCard.cpp

@@ -7,11 +7,12 @@
 #include "m_Do/m_Do_Reset.h"
 #include "JSystem/JKernel/JKRThread.h"
 #include "dolphin/card.h"
+#include "global.h"
 #include "MSL_C/string.h"
 
-u8 MemCardStack[0x1000] __attribute__((aligned(32)));
+u8 MemCardStack[0x1000] ALIGN_DECL(32);
 OSThread MemCardThread;
-u8 MemCardWorkArea0[0xa000] __attribute__((aligned(32)));
+u8 MemCardWorkArea0[0xa000] ALIGN_DECL(32);
 
 mDoMemCd_Ctrl_c g_mDoMemCd_control;
 

src/m_Do/m_Do_main.cpp

@@ -16,6 +16,7 @@
 #include "c/c_dylink.h"
 #include "d/d_com_inf_game.h"
 #include "f_ap/f_ap_game.h"
+#include "global.h"
 #include "m_Do/m_Do_MemCard.h"
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_audio.h"
@@ -351,7 +352,7 @@ bool JKRHeap::dump_sort() {
 s32 LOAD_COPYDATE(void*) {
     s32 status;
 
-    DVDFileInfo __attribute__((aligned(0x20))) fileInfo;
+    DVDFileInfo ALIGN_DECL(0x20) fileInfo;
     u8 buffer[0x20];
     status = DVDOpen("/COPYDATE", &fileInfo);
 
@@ -443,7 +444,7 @@ OSThread mainThread;
 /* 80006464-800065DC       .text main */
 void main() {
     OSThread* current_thread = OSGetCurrentThread();
-    u8 __attribute__((aligned(0x20))) stack[0xF000];
+    u8 ALIGN_DECL(0x20) stack[0xF000];
 
     mDoMain::sPowerOnTime = OSGetTime();
     OSReportInit__Fv();

src/m_Do/m_Do_mtx.cpp

@@ -336,7 +336,7 @@ void mDoMtx_stack_c::lYrotM(s32 param_0) {
 /* 8000D904-8000D940       .text rYrotM__14mDoMtx_stack_cFf */
 void mDoMtx_stack_c::rYrotM(f32 i_rad) {
     Mtx m;
-    PSMTXRotRad(m, 'Y', i_rad);
+    MTXRotRad(m, 'Y', i_rad);
     mDoMtx_concat(now, m, now);
 }