* merged apt--curl-https branch

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

diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h
index a9f4f926c364c6114a0a911006a7b60c135f3d6f..1264982a89e98a238ec534ee97099f2216bc025a 100644 (file)
--- a/apt-pkg/contrib/cdromutl.h
+++ b/apt-pkg/contrib/cdromutl.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cdromutl.h,v 1.1 1998/11/29 01:19:27 jgg Exp $
+// $Id: cdromutl.h,v 1.3 2001/05/07 05:06:52 jgg Exp $

 /* ######################################################################
 
    CDROM Utilities - Some functions to manipulate CDROM mounts.
 /* ######################################################################
 
    CDROM Utilities - Some functions to manipulate CDROM mounts.


@@ -12,12 +12,10 @@
 
 #include <string>
 
 
 #include <string>
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/cdromutl.h"
-#endif 
+using std::string;

 
 bool MountCdrom(string Path);
 bool UnmountCdrom(string Path);
 
 bool MountCdrom(string Path);
 bool UnmountCdrom(string Path);

-bool IdentCdrom(string CD,string &Res);
+bool IdentCdrom(string CD,string &Res,unsigned int Version = 2);

 
 #endif
 
 #endif