diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-10-18 03:37:39 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-10-18 03:37:39 +0000 |
| commit | 6d4e6cc8137ff2ebdbaf055e39ce1263ad634191 (patch) | |
| tree | 8fa6c09f7defeaaf54e2beffed0210a67b7a1db6 /lib | |
| parent | 86cec97b2214cefdbc7cfa1c434c5823b28a47c3 (diff) | |
| download | curl-6d4e6cc8137ff2ebdbaf055e39ce1263ad634191.tar.gz | |
Check for basename() is now done the same as other function checks
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/config-symbian.h | 3 | ||||
| -rw-r--r-- | lib/config-tpf.h | 3 | ||||
| -rw-r--r-- | lib/config-vxworks.h | 3 | ||||
| -rw-r--r-- | lib/formdata.c | 8 |
4 files changed, 4 insertions, 13 deletions
diff --git a/lib/config-symbian.h b/lib/config-symbian.h index 1cdce2616..b26fe46cd 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -634,9 +634,6 @@ /* Define to 1 if you are building a native Windows target. */ /* #undef NATIVE_WINDOWS */ -/* If you lack a fine basename() prototype */ -/* #undef NEED_BASENAME_PROTO */ - /* Define to 1 if you need the lber.h header file even with ldap.h */ /* #undef NEED_LBER_H */ diff --git a/lib/config-tpf.h b/lib/config-tpf.h index 3e482a6bd..cea5d3bd9 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -559,9 +559,6 @@ /* if you have the zlib.h header file */ /* #undef HAVE_ZLIB_H */ -/* If you lack a fine basename() prototype */ -/* #undef NEED_BASENAME_PROTO */ - /* need REENTRANT defined */ /* #undef NEED_REENTRANT */ diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index 5fa94a9d2..34a8c7172 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -733,9 +733,6 @@ /* Define to 1 if you are building a native Windows target. */ /* #undef NATIVE_WINDOWS */ -/* If you lack a fine basename() prototype */ -/* #undef NEED_BASENAME_PROTO */ - /* Define to 1 if you need the lber.h header file even with ldap.h */ /* #undef NEED_LBER_H */ diff --git a/lib/formdata.c b/lib/formdata.c index 9b458c0e2..f2d556ff2 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -135,9 +135,9 @@ Content-Disposition: form-data; name="FILECONTENT" #ifndef CURL_DISABLE_HTTP -#if defined(HAVE_BASENAME) && defined(NEED_BASENAME_PROTO) -/* This system has a basename() but no prototype for it! */ -char *basename(char *path); +#ifndef HAVE_BASENAME +static char *Curl_basename(char *path); +#define basename(x) Curl_basename((x)) #endif static size_t readfromfile(struct Form *form, char *buffer, size_t size); @@ -1067,7 +1067,7 @@ void curl_formfree(struct curl_httppost *form) required to be reentrant is not required to be thread-safe. */ -static char *basename(char *path) +static char *Curl_basename(char *path) { /* Ignore all the details above for now and make a quick and simple implementaion here */ |