upstream

5 files changed, 16 insertions, 10 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index fc612d64fa8..8de94033196 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * README.W32: Update the GTK Windows download URL for libpng.
+
+2011-11-13  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * inc/stdint.h (UINT64_MAX, UINT32_MAX): Fix values.
+
 2011-11-05  Christoph Scholtes  <cschol2112@googlemail.com>
 
         * inc/stdint.h (UINT64_MAX, UINT64_MIN, INT64_MIN, UINTMAX_MAX)
@@ -5,7 +13,7 @@
         (INT32_MIN, UINTMAX_MAX, UINTMAX_MIN, INTMAX_MAX, INTMAX_MIN)
         (intmax_t, INT64_MAX): Add for MSVC.
 
-        * config.nt: (mode_t) [!__GNUC__]: Define mode_t for MSVC.
+        * config.nt (mode_t) [!__GNUC__]: Define mode_t for MSVC.
 
 2011-11-05  Eli Zaretskii  <eliz@gnu.org>
 
@@ -20,7 +28,7 @@
 
         * INSTALL: Update for newer versions of MSVC.
 
-2011-11-05  Fabrice Popineau  <fabrice.popineau@supelec.fr> (tiny change)
+2011-11-05  Fabrice Popineau  <fabrice.popineau@supelec.fr>  (tiny change)
 
         Support MSVC build with newer versions of Visual Studio.
         * nmake.defs (USE_CRT_DLL): Define to 1.
diff --git a/nt/README.W32 b/nt/README.W32
index e4044e409d4..52582dc7ccf 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -129,7 +129,7 @@ See the end of the file for license conditions.
 
   Emacs can also support some other image formats with appropriate
   libraries.  These libraries are all available as part of GTK
-  download for Windows (http://www.gtk.org/download-windows.html), or
+  download for Windows (http://www.gtk.org/download/win32.php), or
   from the GnuWin32 project.  Emacs will find them if the directory
   they are installed in is on the PATH.
 
@@ -142,7 +142,7 @@ See the end of the file for license conditions.
       the PNG support will not work, and you will have to download
       newer versions.
 
-      JPEG: requires the Independant JPEG Group's libjpeg 6b or later,
+      JPEG: requires the Independent JPEG Group's libjpeg 6b or later,
       which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
 
       TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 46d4acf76dd..a1ff7af853e 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -95,7 +95,7 @@ THISDIR		= .
 ifdef USING_SH
 sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2)
 sh_output := $(shell echo foo")
-# This single quote " is to fix fintification due to previous line
+# This single quote " is to fix fontification due to previous line
 ifeq "$(sh_output)" ""
 NEW_CYGWIN = 1
 endif
@@ -311,4 +311,3 @@ export XMFLAGS
 
 $(BLD)/%.o: %.c
                 $(CC) $(CFLAGS) $(CC_OUT)$@ $<
-
diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h
index 5242a45df44..fa2e06f3da9 100644
--- a/nt/inc/stdint.h
+++ b/nt/inc/stdint.h
@@ -29,7 +29,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef _WIN64
 typedef __int64 intptr_t;
-#define UINT64_MAX 18446744073709551616
+#define UINT64_MAX 18446744073709551615
 #define UINT64_MIN 0
 /* "i64" is the non-standard suffix used by MSVC for 64-bit constants.  */
 #define INT64_MAX 9223372036854775807i64
@@ -42,7 +42,7 @@ typedef __int64 intptr_t;
 #else
 typedef int intptr_t;
 typedef unsigned int uint32_t;
-#define UINT32_MAX 4294967296
+#define UINT32_MAX 4294967295
 #define UINT32_MIN 0
 #define INT32_MAX 2147483647
 #define INT32_MIN (~INT32_MAX)
diff --git a/nt/preprep.c b/nt/preprep.c
index 6b764afdeab..7541536714c 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -321,7 +321,7 @@ relocate_offset (DWORD offset,
    variables, because of dumping.]
 
    We could potentially generate the relocation data ourselves by making
-   two versions of temacs, one with an extra dummmy section before
+   two versions of temacs, one with an extra dummy section before
    EMHEAP to offset it, and then compare the dumped executables from
    both.  That is a lot of work though, and it doesn't solve the problem
    of dumped pointers to static variables, which also can be relocated.
@@ -825,4 +825,3 @@ main (int argc, char **argv)
 }
 
 /* eof */
-