diff options
| author | ng0 <ng0@infotropique.org> | 2017-10-07 10:47:21 +0000 |
|---|---|---|
| committer | ng0 <ng0@infotropique.org> | 2017-10-07 10:47:21 +0000 |
| commit | 452d818d1e54b0ead52bd4fe1e994aab48bf96f7 (patch) | |
| tree | f7e01802d2ae74f764e5836432788b202d001fe9 | |
| parent | d7ce457c1b3c72fbc73cc18eab5b6b025f10ee8c (diff) | |
| download | gnurl-452d818d1e54b0ead52bd4fe1e994aab48bf96f7.tar.gz gnurl-452d818d1e54b0ead52bd4fe1e994aab48bf96f7.tar.bz2 gnurl-452d818d1e54b0ead52bd4fe1e994aab48bf96f7.zip | |
Further merge cleanup, leftovers in lib/url.c (elif where none should be/end), src/Makefile.am (duplicate entry).
| -rw-r--r-- | lib/url.c | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 0 insertions, 3 deletions
@@ -4525,7 +4525,6 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data, /* This cannot be made with strcpy, as the memory chunks overlap! */ memmove(path, ptr, strlen(ptr) + 1); } -#endif #if !defined(MSDOS) && !defined(WIN32) && !defined(__CYGWIN__) if(STARTS_WITH_DRIVE_PREFIX(path)) { diff --git a/src/Makefile.am b/src/Makefile.am index f436524bd..00cdfa84b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,8 +45,6 @@ bin_PROGRAMS = gnurl SUBDIRS = ../docs -SUBDIRS = ../docs - if USE_CPPFLAG_CURL_STATICLIB AM_CPPFLAGS += -DCURL_STATICLIB endif |