Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / contrib / netrc.h

diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h
index 6feb5b726f40ff0853501e49399d6d4cdb04ef64..b5b56f5d40c5cfaf4853046d609530e8fd98b48d 100644 (file)
--- a/apt-pkg/contrib/netrc.h
+++ b/apt-pkg/contrib/netrc.h
@@ -16,6 +16,8 @@
 
 #include <string>
 
 
 #include <string>
 

+#include <apt-pkg/macros.h>
+

 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/strutl.h>
 #endif
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/strutl.h>
 #endif


@@ -25,9 +27,5 @@
 
 class URI;
 
 
 class URI;
 

-// kill this export on the next ABI break - strongly doubt its in use anyway
-// outside of the apt itself, its really a internal interface
-__deprecated int parsenetrc (char *host, char *login, char *password, char *filename);
-

 void maybe_add_auth (URI &Uri, std::string NetRCFile);
 #endif
 void maybe_add_auth (URI &Uri, std::string NetRCFile);
 #endif