From 29aec734715f7c4d6b8157ac514eff4fd8dd0242 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>
Date: Mon, 21 Feb 2011 15:39:14 +0100
Subject: Include config.h and test the library
---
src/CMakeLists.txt | 2 ++
src/cameras/uca_pco.c | 2 +-
src/cameras/uca_pco.h | 2 +-
src/uca.c | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0d6ce94..dde0a01 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,6 +42,8 @@ endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/config.h)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
# --- Build target ------------------------------------------------------------
add_library(uca SHARED ${uca_SRCS})
diff --git a/src/cameras/uca_pco.c b/src/cameras/uca_pco.c
index daba6f6..0359990 100644
--- a/src/cameras/uca_pco.c
+++ b/src/cameras/uca_pco.c
@@ -11,7 +11,7 @@ static void uca_pco_destroy(struct uca_t *uca)
pco_destroy(pco);
}
-uint8_t uca_pco_init(struct uca_t *uca)
+int uca_pco_init(struct uca_t *uca)
{
pco = pco_init();
if (!pco_active(pco)) {
diff --git a/src/cameras/uca_pco.h b/src/cameras/uca_pco.h
index c314ffe..f2e7174 100644
--- a/src/cameras/uca_pco.h
+++ b/src/cameras/uca_pco.h
@@ -3,6 +3,6 @@
struct uca_t;
-uint8_t uca_pco_init(struct uca_t *uca);
+int uca_pco_init(struct uca_t *uca);
#endif
diff --git a/src/uca.c b/src/uca.c
index 7889fe2..3549e60 100644
--- a/src/uca.c
+++ b/src/uca.c
@@ -1,5 +1,6 @@
#include <stdlib.h>
+#include "config.h"
#include "uca.h"
#ifdef HAVE_PCO_EDGE
--
cgit v1.2.3