summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/makefile.w32-in1
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/inc/stdint.h34
4 files changed, 45 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b18f8177dd..13e3657bac3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-21 Christoph Scholtes <cschol2112@gmail.com>
+
+ * lib/makefile.w32-in: ($(BLD)/md5.$(O)): Added dependency on
+ $(EMACS_ROOT)/nt/inc/stdint.h.
+
2011-02-21 Eli Zaretskii <eliz@gnu.org>
* lib/makefile.w32-in ($(BLD)/filemode.$(O)): Move from
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index f1071c9dbfd..289f6bffdb9 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -98,6 +98,7 @@ $(BLD)/time_r.$(O) : \
$(BLD)/md5.$(O) : \
$(SRC)/md5.c \
$(SRC)/md5.h \
+ $(EMACS_ROOT)/nt/inc/stdint.h \
$(EMACS_ROOT)/src/s/ms-w32.h \
$(EMACS_ROOT)/src/m/intel386.h \
$(EMACS_ROOT)/src/config.h
diff --git a/nt/ChangeLog b/nt/ChangeLog
index b89e33074f3..f20fbd1d31a 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-21 Christoph Scholtes <cschol2112@gmail.com>
+
+ * inc/stdint.h: New file, to support compilation with tool chains
+ that do not have stdint.h (e.g. MSVC).
+
2011-02-21 Eli Zaretskii <eliz@gnu.org>
* inc/sys/stat.h (S_ISUID, S_ISGID, S_ISVTX, S_IRGRP, S_IROTH)
diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h
new file mode 100644
index 00000000000..ed4e26a6867
--- /dev/null
+++ b/nt/inc/stdint.h
@@ -0,0 +1,34 @@
+/* Replacement stdint.h file for building GNU Emacs on Windows.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef _NT_STDINT_H_
+#define _NT_STDINT_H_
+
+#ifdef __GNUC__
+# include_next <stdint.h> /* use stdint.h if available */
+#else /* !__GNUC__ */
+
+/* Minimum definitions to allow compilation with tool chains where
+ stdint.h is not available, e.g. Microsoft Visual Studio. */
+
+typedef unsigned int uint32_t;
+
+#endif /* !__GNUC__ */
+
+#endif /* _NT_STDINT_H_ */