diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-08 15:25:43 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-08 15:25:43 +0200 |
| commit | 29bc06137f829d51608fe697f3e27125d883fcef (patch) | |
| tree | 7121486de1ce74a3e979f3dc0d6bc60b8a59dfe7 /apt-pkg/cdrom.h | |
| parent | f96bcef72c47ab32f4742da2673a12b3a47d8367 (diff) | |
| parent | a1e9379a86f199817d275b2d28d1a6b61039fcaa (diff) | |
merged from ubuntu-plus-debian-experimental
Diffstat (limited to 'apt-pkg/cdrom.h')
| -rw-r--r-- | apt-pkg/cdrom.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index e83c38582..614062cbb 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -92,9 +92,7 @@ class pkgUdevCdromDevices /*{{{*/ struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev); struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry); const char* (*udev_device_get_property_value)(struct udev_device *udev_device, const char *key); -#if 0 // FIXME: uncomment on next ABI break int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value); -#endif // end libudev dlopen public: @@ -104,11 +102,11 @@ class pkgUdevCdromDevices /*{{{*/ // try to open bool Dlopen(); - // this is the new interface - vector<CdromDevice> ScanForRemovable(bool CdromOnly); - // FIXME: compat with the old interface/API/ABI only + // convenience interface, this will just call ScanForRemovable + // with "APT::cdrom::CdromOnly" vector<CdromDevice> Scan(); + vector<CdromDevice> ScanForRemovable(bool CdromOnly); }; /*}}}*/ |