[gvfs] gphoto2: include gvfsgphoto2utils.h conditionally



commit e3fab1313117d8fefc98976b8c97d0f98cbb1819
Author: Ondrej Holy <oholy redhat com>
Date:   Fri Oct 17 09:20:50 2014 +0200

    gphoto2: include gvfsgphoto2utils.h conditionally
    
    gvfsgphoto2utils.h causes build failure if gudev isn't available thus
    include the header conditionally.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=736285

 daemon/gvfsbackendgphoto2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/daemon/gvfsbackendgphoto2.c b/daemon/gvfsbackendgphoto2.c
index 39c4f77..90d8dd9 100644
--- a/daemon/gvfsbackendgphoto2.c
+++ b/daemon/gvfsbackendgphoto2.c
@@ -38,6 +38,7 @@
 #include <gphoto2.h>
 #ifdef HAVE_GUDEV
   #include <gudev/gudev.h>
+  #include "gvfsgphoto2utils.h"
 #elif defined(HAVE_HAL)
   #include <libhal.h>
   #include <dbus/dbus.h>
@@ -62,7 +63,6 @@
 #include "gvfsmonitor.h"
 #include "gvfsjobseekwrite.h"
 #include "gvfsicon.h"
-#include "gvfsgphoto2utils.h"
 
 /* showing debug traces */
 #if 1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]