summaryrefslogtreecommitdiff
path: root/camlibs/sonydscf1
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <gp@n-dimensional.de>2005-04-14 21:30:58 +0000
committerHans Ulrich Niedermann <gp@n-dimensional.de>2005-04-14 21:30:58 +0000
commit2a807adf5a70f4a1a7d341dac3692025610a9a65 (patch)
tree2f995b10f3f23ac771a49a53ef6c412cbb5b3a52 /camlibs/sonydscf1
parentcda224bf0482cb0eca5e281d1c59fe8fd019abea (diff)
downloadlibgphoto2-2a807adf5a70f4a1a7d341dac3692025610a9a65.tar.gz
more new build system
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7835 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sonydscf1')
-rw-r--r--camlibs/sonydscf1/chotplay.c8
-rw-r--r--camlibs/sonydscf1/common.h6
2 files changed, 13 insertions, 1 deletions
diff --git a/camlibs/sonydscf1/chotplay.c b/camlibs/sonydscf1/chotplay.c
index 09bc781dd..04b17ee60 100644
--- a/camlibs/sonydscf1/chotplay.c
+++ b/camlibs/sonydscf1/chotplay.c
@@ -9,17 +9,23 @@
#ifdef BINARYFILEMODE
#include <fcntl.h> /* for setmode() */
#endif
+
#include <stdlib.h>
#include <time.h>
+
#if HAVE_UNISTD_H
# include <sys/types.h>
# include <unistd.h>
#endif
+
#if HAVE_SYS_PARAM_H
# include <sys/param.h>
#else
-#define MAXPATHLEN 256
+# ifndef MAXPATHLEN
+# define MAXPATHLEN 256
+# endif
#endif
+
#include <termios.h>
#include "chotplay.h"
diff --git a/camlibs/sonydscf1/common.h b/camlibs/sonydscf1/common.h
index 4ce92af0e..6d8449e0d 100644
--- a/camlibs/sonydscf1/common.h
+++ b/camlibs/sonydscf1/common.h
@@ -11,6 +11,8 @@
/* NEXTSTEP "/dev/ttya" */
/* IRIX "/dev/ttyf1" */
+#include <config.h>
+
#if defined(WIN32) || defined(OS2)
#define RSPORT "COM1"
#else
@@ -42,6 +44,10 @@
#ifdef STDC_HEADERS
# define P__(x) x
#else
+# error STDC_HEADERS NOT defined
+# error Compilation of functions defined with P__ will fail anyway, so
+# error it does not hurt if we abort it here a little earlier and more
+# error to the point.
# define P__(x) ()
#endif