Mercurial > vim

changeset 2197:898bc87c6600 vim73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
One more fix for defining uint32_t.
author Bram Moolenaar <bram@vim.org>
date Tue, 18 May 2010 21:49:58 +0200
parents 99e5a139e67a
children e741fe7a0547
files src/netbeans.c src/vim.h
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -47,6 +47,7 @@
    * stdint.h which tries to typedef uint32_t and fails. */
 # ifdef uint32_t
 #  undef uint32_t
+#  undef __uint32_t_defined
 # endif
 # include <netdb.h>
 # include <netinet/in.h>
--- a/src/vim.h
+++ b/src/vim.h
@@ -32,6 +32,10 @@
 # include "auto/config.h"
 # define HAVE_PATHDEF
 
+/* Avoid a problem when stdint.h gets included later, autoconf defines
+ * uint32_t when it is not typedef'ed. */
+# define __uint32_t_defined
+
 /*
  * Check if configure correctly managed to find sizeof(int).  If this failed,
  * it becomes zero.  This is likely a problem of not being able to run the
@@ -2075,6 +2079,7 @@ typedef int VimClipboard;	/* This is req
  * stdint.h which tries to typedef uint32_t and fails. */
 # ifdef uint32_t
 #  undef uint32_t
+#  undef __uint32_t_defined
 # endif
 
 # ifdef __BORLANDC__