Commit cd376509 authored by Eli Zaretskii's avatar Eli Zaretskii

Fix the MS-Windows build broken by 1995-02-25T20:57:45Z!rms@gnu.org.

 lib/makefile.w32-in ($(BLD)/md5.$(O)): 
 ($(BLD)/sha1.$(O)): 
 ($(BLD)/sha256.$(O)): 
 ($(BLD)/sha512.$(O)): Depend on $(EMACS_ROOT)/nt/inc/stdalign.h.
 Suggested by Christoph Scholtes <cschol2112@googlemail.com>.
 lib/getopt_.h: Regenerate.
 nt/inc/stdalign.h: New file.

Fixes: debbugs:11527
parent 0eb775a3
2012-05-27 Eli Zaretskii <eliz@gnu.org>
* lib/makefile.w32-in ($(BLD)/md5.$(O)):
($(BLD)/sha1.$(O)):
($(BLD)/sha256.$(O)):
($(BLD)/sha512.$(O)): Depend on $(EMACS_ROOT)/nt/inc/stdalign.h.
Suggested by Christoph Scholtes <cschol2112@googlemail.com>.
* lib/getopt_.h: Regenerate.
2012-05-27 Paul Eggert <eggert@cs.ucla.edu>
Assume gnulib does largefile.
......
This diff is collapsed.
......@@ -105,6 +105,7 @@ $(BLD)/md5.$(O) : \
$(SRC)/md5.c \
$(SRC)/md5.h \
$(EMACS_ROOT)/nt/inc/stdint.h \
$(EMACS_ROOT)/nt/inc/stdalign.h \
$(EMACS_ROOT)/nt/inc/sys/stat.h \
$(EMACS_ROOT)/src/s/ms-w32.h \
$(EMACS_ROOT)/src/config.h
......@@ -113,6 +114,7 @@ $(BLD)/sha1.$(O) : \
$(SRC)/sha1.c \
$(SRC)/sha1.h \
$(EMACS_ROOT)/nt/inc/stdint.h \
$(EMACS_ROOT)/nt/inc/stdalign.h \
$(EMACS_ROOT)/nt/inc/sys/stat.h \
$(EMACS_ROOT)/src/s/ms-w32.h \
$(EMACS_ROOT)/src/config.h
......@@ -121,6 +123,7 @@ $(BLD)/sha256.$(O) : \
$(SRC)/sha256.c \
$(SRC)/sha256.h \
$(EMACS_ROOT)/nt/inc/stdint.h \
$(EMACS_ROOT)/nt/inc/stdalign.h \
$(EMACS_ROOT)/nt/inc/sys/stat.h \
$(EMACS_ROOT)/src/s/ms-w32.h \
$(EMACS_ROOT)/src/config.h
......@@ -129,6 +132,7 @@ $(BLD)/sha512.$(O) : \
$(SRC)/sha512.c \
$(SRC)/sha512.h \
$(EMACS_ROOT)/nt/inc/stdint.h \
$(EMACS_ROOT)/nt/inc/stdalign.h \
$(EMACS_ROOT)/nt/inc/sys/stat.h \
$(EMACS_ROOT)/src/s/ms-w32.h \
$(EMACS_ROOT)/src/config.h
......
2012-05-27 Eli Zaretskii <eliz@gnu.org>
* inc/stdalign.h: New file.
* configure.bat: Ensure a space between %var% expansion and
redirection symbol '>', which breaks when %var% ends in a digit,
such as 1.
......
#ifndef _NT_STDALIGN_H_
#define _NT_STDALIGN_H_
/* This header has the necessary stuff from lib/stdalign.in.h, but
avoids the need to have Sed at build time. */
#include <stddef.h>
#if defined __cplusplus
template <class __t> struct __alignof_helper { char __a; __t __b; };
# define _Alignof(type) offsetof (__alignof_helper<type>, __b)
#else
# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
#endif
#define alignof _Alignof
#endif /* _NT_STDALIGN_H_ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment