blob: 5840fcea2fb9ce6549c7cdb24383fa09c472b107 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
$NetBSD: patch-ad,v 1.4 2005/06/02 17:10:10 jmmv Exp $
http://bugzilla.gnome.org/show_bug.cgi?id=134276
--- modules/cdda-method.c.orig 2004-01-22 13:29:10.000000000 +0100
+++ modules/cdda-method.c
@@ -623,10 +623,10 @@ do_get_file_info (GnomeVFSMethod *method
/* Check and see if we already have opened and stashed this drive */
if (!use_base) {
if (global_context != NULL) {
-#ifdef __linux__
- if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
-#elif defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) {
+#else
+ if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
#endif
use_cache = TRUE;
cdda_close (drive);
@@ -713,10 +713,10 @@ do_open_directory (GnomeVFSMethod *metho
if (!use_base) {
/* Check for cache */
if (global_context != NULL) {
-#ifdef __linux__
- if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
-#elif defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) {
+#else
+ if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
#endif
/* Clear old cache */
cdda_context_free (global_context);
|
