diff options
| author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2004-10-02 19:38:59 +0000 |
|---|---|---|
| committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2004-10-02 19:38:59 +0000 |
| commit | 3283fd5d9bdc734fed8276dd4675833e02670cfe (patch) | |
| tree | 51e55a698b4d698ff8835cd383661c964865897a /src/ne_uri.c | |
| parent | 08c4265e806d73805c51fa67b64aa33861740679 (diff) | |
| download | neon-3283fd5d9bdc734fed8276dd4675833e02670cfe.tar.gz | |
Merge trunk up to current neon CVS HEAD.
git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@256 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
Diffstat (limited to 'src/ne_uri.c')
| -rw-r--r-- | src/ne_uri.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/ne_uri.c b/src/ne_uri.c index 51107d1..0aab20d 100644 --- a/src/ne_uri.c +++ b/src/ne_uri.c @@ -34,9 +34,10 @@ #include <stdlib.h> #endif +#include <stdio.h> + #include <ctype.h> -#include "ne_utils.h" /* for 'min' */ #include "ne_string.h" /* for ne_buffer */ #include "ne_alloc.h" #include "ne_uri.h" @@ -277,6 +278,11 @@ int ne_uri_cmp(const ne_uri *u1, const ne_uri *u2) #undef CMP #undef CASECMP +#ifndef WIN32 +#undef min +#define min(a,b) ((a)<(b)?(a):(b)) +#endif + /* TODO: implement properly */ int ne_path_compare(const char *a, const char *b) { |