merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

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

diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h
index 02a5eb09f480c03dc3580984ecf59a4f2796fd4a..7349126c4fcaf8e143bdf50a6fe3a239b6df174a 100644 (file)
--- a/apt-pkg/contrib/netrc.h
+++ b/apt-pkg/contrib/netrc.h
@@ -14,16 +14,16 @@
 #ifndef NETRC_H
 #define NETRC_H
 
+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/strutl.h>
+#endif
 
 #define DOT_CHAR "."
 #define DIR_CHAR "/"
 
-// Assume: password[0]=0, host[0] != 0.
-// If login[0] = 0, search for login and password within a machine section
-// in the netrc.
-// If login[0] != 0, search for password within machine and login.
-int parsenetrc (char *host, char *login, char *password, char *filename);
+class URI;
 
-void maybe_add_auth (URI &Uri, string NetRCFile);
+void maybe_add_auth (URI &Uri, std::string NetRCFile);
 #endif