Merge from emacs-24; up to 2013-01-03T01:56:56Z!rgm@gnu.org

[gnu-emacs] / nt / emacs.rc

diff --git a/nt/emacs.rc b/nt/emacs.rc
index d2703c45869c21bd8715bfdea387cbe4984a5543..81d283f70afb61a6d9a36ef5edd78aa042330a2e 100644 (file)
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -1,6 +1,6 @@
 Emacs ICON   icons/emacs.ico
 32649 CURSOR icons/hand.cur
-#ifdef WIN64
+#if defined (WIN64) || defined (__x86_64__)
 1 24 "emacs-x64.manifest"
 #else
 1 24 "emacs-x86.manifest"