diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-05-18 21:49:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-05-18 21:49:58 +0200 |
| commit | 4890f1f7f47242dd7b2e9d2a22759449f13ebe6b (patch) | |
| tree | 7c6e918d791f3e8d6d11ee04415a451ff9d89e85 /src | |
| parent | 6323508e5e861218da88c3c6747a360f396f5c8f (diff) | |
| download | vim-4890f1f7f47242dd7b2e9d2a22759449f13ebe6b.zip | |
One more fix for defining uint32_t.
Diffstat (limited to 'src')
| -rw-r--r-- | src/netbeans.c | 1 | ||||
| -rw-r--r-- | src/vim.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/netbeans.c b/src/netbeans.c index 0ef6b6904..e058f9e8e 100644 --- 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> @@ -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 required for the prototypes. */ * stdint.h which tries to typedef uint32_t and fails. */ # ifdef uint32_t # undef uint32_t +# undef __uint32_t_defined # endif # ifdef __BORLANDC__ |