fix memcpy

Author: kinkie

src/base64/Base64Encoder.cc

@@ -168,7 +168,7 @@ Base64Encoder::Base64StreamBuf::xsputn(const char *s, std::streamsize n)
 
         encoder_.checkSizeLimit(toCopy);
 
-        std::memcpy(inputBuffer_ + inputBufferPos_, s, toCopy);
+        memcpy(inputBuffer_ + inputBufferPos_, s, toCopy);
         inputBufferPos_ += toCopy;
         s += toCopy;
         n -= toCopy;
@@ -180,4 +180,4 @@ Base64Encoder::Base64StreamBuf::xsputn(const char *s, std::streamsize n)
 
     encoder_.encodePending(); // Sync after every append
     return written;
-}
+}

src/base64/Makefile.am

@@ -13,4 +13,8 @@ libbase64_la_SOURCES = \
 	Base64Encoder.cc \
 	Base64Encoder.h
 
-libbase64_la_LIBADD = $(LIBNETTLE_LIBS)
+libbase64_la_LIBADD = \
+	$(top_builddir)/lib/libmiscencoding.la \
+	$(COMPAT_LIB) \
+	$(LIBNETTLE_LIBS) \
+	$(XTRA_LIBS)