X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/a30fb04fbc84ffc78dbba967f4e0478cdf69236a..af91f644f4f857ddffcf3744987e89e2dc31dc19:/config.bat

diff --git a/config.bat b/config.bat
index 6477524439..9a80f5d785 100644
--- a/config.bat
+++ b/config.bat
@@ -1,7 +1,7 @@
 @echo off
 rem   ----------------------------------------------------------------------
 rem   Configuration script for MSDOS
-rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2004
+rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2004, 2006
 rem   Free Software Foundation, Inc.
 
 rem   This file is part of GNU Emacs.
@@ -18,8 +18,8 @@ rem   GNU General Public License for more details.
 
 rem   You should have received a copy of the GNU General Public License
 rem   along with GNU Emacs; see the file COPYING.  If not, write to the
-rem   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-rem   Boston, MA 02111-1307, USA.
+rem   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+rem   Boston, MA 02110-1301, USA.
 rem   ----------------------------------------------------------------------
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
 rem
@@ -161,8 +161,9 @@ sed -f ../msdos/sed2v2.inp <config.tmp >config.h2
 Rem See if DECL_ALIGN can be supported with this GCC
 rm -f junk.c junk.o junk junk.exe
 echo struct { int i; char *p; } __attribute__((__aligned__(8))) foo;  >junk.c
-rem Two percent signs because it is a special character for COMMAND.COM
-echo int main(void) { return (unsigned long)&foo %% 8; }             >>junk.c
+rem Two percent signs because it is a special character for COMMAND.COM/CMD
+rem Filter thru Sed because "&" is special for CMD.EXE
+echo int main(void) { return (unsigned long)"&"foo %% 8; } | sed "s/.&./\&/"         >>junk.c
 gcc -o junk junk.c
 if not exist junk.exe coff2exe junk
 junk
@@ -171,7 +172,7 @@ Echo WARNING: Your GCC does not support 8-byte aligned variables.
 Echo WARNING: Therefore Emacs cannot support buffers larger than 128MB.
 rem The following line disables DECL_ALIGN which in turn disables USE_LSB_TAG
 rem For details see lisp.h where it defines USE_LSB_TAG
-echo #define DECL_ALIGN(type, var) type var >>config.h2
+echo #define NO_DECL_ALIGN >>config.h2
 :alignOk
 rm -f junk.c junk junk.exe
 update config.h2 config.h >nul