[GNUnet-SVN] [gnurl] branch master updated: Further merge cleanup, leftovers in lib/url.c (elif where none should be/end), src/Makefile.am (duplicate entry).

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

The following commit(s) were added to refs/heads/master by this push:
     new 452d818d1 Further merge cleanup, leftovers in lib/url.c (elif where 
none should be/end), src/Makefile.am (duplicate entry).
452d818d1 is described below

commit 452d818d1e54b0ead52bd4fe1e994aab48bf96f7
Author: ng0 <address@hidden>
AuthorDate: Sat Oct 7 10:47:21 2017 +0000

    Further merge cleanup, leftovers in lib/url.c (elif where none should 
be/end), src/Makefile.am (duplicate entry).
---
 lib/url.c       | 1 -
 src/Makefile.am | 2 --
 2 files changed, 3 deletions(-)

diff --git a/lib/url.c b/lib/url.c
index 55884c982..1e56b7d87 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -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

-- 
To stop receiving notification emails like this one, please contact
address@hidden