Merge from emacs-24; up to 2014-04-04T23:31:02Z!joaotavora@gmail.com

[gnu-emacs] / nt / emacs.rc

diff --git a/nt/emacs.rc b/nt/emacs.rc
index f363e6aad7800e39a5282ead922b6522f2d70628..2d007ba9043a76121f52127b778e1a141a130738 100644 (file)
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -1,12 +1,10 @@
 Emacs ICON   icons/emacs.ico
 32649 CURSOR icons/hand.cur
-#ifndef __CYGWIN__
-#ifdef WIN64
+#if defined (WIN64) || defined (__x86_64__)
 1 24 "emacs-x64.manifest"
 #else
 1 24 "emacs-x86.manifest"
 #endif
-#endif
 
 #ifndef VS_VERSION_INFO
 #define VS_VERSION_INFO 1