Clean up some defines and move it into crtdefs.h



git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@533 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/_mingw.h b/mingw-w64-headers/include/_mingw.h
index a729fe9..7566438 100644
--- a/mingw-w64-headers/include/_mingw.h
+++ b/mingw-w64-headers/include/_mingw.h
@@ -418,14 +418,6 @@
 #define _CRT_ALIGN(x) __attribute__ ((aligned(x)))
 #endif
 
-#ifndef _CRTNOALIAS
-#define _CRTNOALIAS
-#endif
-
-#ifndef _CRTRESTRICT
-#define _CRTRESTRICT
-#endif
-
 #ifndef __CRTDECL
 #define __CRTDECL __cdecl
 #endif
@@ -488,8 +480,6 @@
 }
 #endif
 
-#define __crt_typefix(ctype)
-
 #ifndef _CRT_UNUSED
 #define _CRT_UNUSED(x) (void)x
 #endif
diff --git a/mingw-w64-headers/include/crtdefs.h b/mingw-w64-headers/include/crtdefs.h
index e958b56..e6c1841 100644
--- a/mingw-w64-headers/include/crtdefs.h
+++ b/mingw-w64-headers/include/crtdefs.h
@@ -10,3 +10,14 @@
 typedef int errcode;
 #endif
 
+#ifndef _CRTNOALIAS
+#define _CRTNOALIAS
+#endif
+
+#ifndef _CRTRESTRICT
+#define _CRTRESTRICT
+#endif
+
+#ifndef __crt_typefix
+#define __crt_typefix(ctype)
+#endif