apt-pkg/contrib/sha2_internal.h: remove extern "C" to avoid symbol clash with libssl

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

diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h
index 3180a03c70f4bcf6a54fbf18d7b2382f19b4b5f6..38ed2996ee79d0a3a4b8815c37a525bcaae39476 100644 (file)
--- a/apt-pkg/contrib/cdromutl.h
+++ b/apt-pkg/contrib/cdromutl.h
@@ -8,18 +8,17 @@
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_CDROMUTL_H
-#define PKGLIB_ACQUIRE_METHOD_H
+#define PKGLIB_CDROMUTL_H
 
 #include <string>
 
 using std::string;
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/cdromutl.h"
-#endif 
-
-bool MountCdrom(string Path);
+// mount cdrom, DeviceName (e.g. /dev/sr0) is optional
+bool MountCdrom(string Path, string DeviceName="");
 bool UnmountCdrom(string Path);
 bool IdentCdrom(string CD,string &Res,unsigned int Version = 2);
+bool IsMounted(string &Path);
+string FindMountPointForDevice(const char *device);
 
 #endif