summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2007-05-21 20:24:18 +0000
committerMarcus Meissner <marcus@jet.franken.de>2007-05-21 20:24:18 +0000
commit4779d5a637983a7e1e2d5c50b2be221f1957f9cd (patch)
tree55a6c649a1a3d34182203403c8bdea361d7a075e
parentebc5a497cebdd4946b9a5f66fc7eb24d891e5e46 (diff)
downloadlibgphoto2-4779d5a637983a7e1e2d5c50b2be221f1957f9cd.tar.gz
removed/ changed some includes to avoid unnecessary levels
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10288 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--libgphoto2/gphoto2-camera.c1
-rw-r--r--libgphoto2/jpeg.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/libgphoto2/gphoto2-camera.c b/libgphoto2/gphoto2-camera.c
index f0b1528d7..4a6c57d80 100644
--- a/libgphoto2/gphoto2-camera.c
+++ b/libgphoto2/gphoto2-camera.c
@@ -34,7 +34,6 @@
#include <ltdl.h>
-#include <gphoto2/gphoto2-context.h>
#include <gphoto2/gphoto2-result.h>
#include <gphoto2/gphoto2-library.h>
#include <gphoto2/gphoto2-port-log.h>
diff --git a/libgphoto2/jpeg.c b/libgphoto2/jpeg.c
index 863f97eff..d9b0e1225 100644
--- a/libgphoto2/jpeg.c
+++ b/libgphoto2/jpeg.c
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <gphoto2/gphoto2-library.h>
+#include <gphoto2/gphoto2-file.h>
/* call example:nullpictureabort(picture,"Picture",0); */
#define nullpointerabort(pointer,name,val) \