Fixed some C89 portability issues.

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@13143 67ed7778-7388-44ab-90cf-0a291f65f57c

10 files changed, 14 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index e1f47142c..606e79a0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-10  Dan Fandrich <dan@coneharvesters.com>
+
+	* Fixed some C89 portability issues.
+
 2010-03-12  Hans de Goede <hdegoede@redhat.com>
 
 	* camlibs/st2205: New camera driver for ST2205 based picture frames.
diff --git a/camlibs/ax203/ax203.c b/camlibs/ax203/ax203.c
index 59094b4fb..a251d4631 100644
--- a/camlibs/ax203/ax203.c
+++ b/camlibs/ax203/ax203.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <stdint.h>
+#include <_stdint.h>
 #include <stdlib.h>
 #include <time.h>
 #include <fcntl.h>
diff --git a/camlibs/ax203/ax203_decode_yuv.c b/camlibs/ax203/ax203_decode_yuv.c
index 87811e623..d70719e69 100644
--- a/camlibs/ax203/ax203_decode_yuv.c
+++ b/camlibs/ax203/ax203_decode_yuv.c
@@ -21,7 +21,7 @@
 #ifdef STANDALONE_MAIN
 
 #include <stdio.h>
-#include <stdint.h>
+#include <_stdint.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/camlibs/ax203/ax203_decode_yuv_delta.c b/camlibs/ax203/ax203_decode_yuv_delta.c
index e61bf9966..b89f8d18c 100644
--- a/camlibs/ax203/ax203_decode_yuv_delta.c
+++ b/camlibs/ax203/ax203_decode_yuv_delta.c
@@ -21,7 +21,7 @@
 #ifdef STANDALONE_MAIN
 
 #include <stdio.h>
-#include <stdint.h>
+#include <_stdint.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/camlibs/ax203/jidctflt.c b/camlibs/ax203/jidctflt.c
index 532abc7ea..5d4d17c26 100644
--- a/camlibs/ax203/jidctflt.c
+++ b/camlibs/ax203/jidctflt.c
@@ -71,7 +71,7 @@
  * we use floating point arithmetic.
  */
 
-#include <stdint.h>
+#include <_stdint.h>
 #include "tinyjpeg-internal.h"
 
 #define FAST_FLOAT float
diff --git a/camlibs/ax203/tinyjpeg.c b/camlibs/ax203/tinyjpeg.c
index 2c0767b44..0a29ca4df 100644
--- a/camlibs/ax203/tinyjpeg.c
+++ b/camlibs/ax203/tinyjpeg.c
@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
+#include <_stdint.h>
 #include <errno.h>
 
 #include "tinyjpeg.h"
diff --git a/camlibs/canon/library.c b/camlibs/canon/library.c
index 2bee2ee7f..6df1c7ff9 100644
--- a/camlibs/canon/library.c
+++ b/camlibs/canon/library.c
@@ -1565,6 +1565,7 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 	unsigned int expbias;
 	time_t camtime;
 	char formatted_camera_time[30];
+	float zoom;
 
 	GP_DEBUG ("camera_get_config()");
 
@@ -1724,7 +1725,7 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 	gp_widget_set_range (t, 0, 255, 1);
 	/* Set an unknown zoom level (at the moment we don't read the
 	 * zoom level */
-	float zoom = -1;
+	zoom = -1;
 	gp_widget_set_value (t, &zoom);
 	gp_widget_append (section, t);
 
diff --git a/camlibs/jl2005c/jl2005bcd_decompress.c b/camlibs/jl2005c/jl2005bcd_decompress.c
index 66255d258..d208ab7cf 100644
--- a/camlibs/jl2005c/jl2005bcd_decompress.c
+++ b/camlibs/jl2005c/jl2005bcd_decompress.c
@@ -24,7 +24,7 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
+#include <_stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/camlibs/st2205/st2205.c b/camlibs/st2205/st2205.c
index 07fcdfc6f..25c486cd5 100644
--- a/camlibs/st2205/st2205.c
+++ b/camlibs/st2205/st2205.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <stdint.h>
+#include <_stdint.h>
 #include <stdlib.h>
 #include <time.h>
 #include <fcntl.h>
diff --git a/camlibs/topfield/tf_bytes.h b/camlibs/topfield/tf_bytes.h
index 58166eade..cfa70ca2c 100644
--- a/camlibs/topfield/tf_bytes.h
+++ b/camlibs/topfield/tf_bytes.h
@@ -23,7 +23,7 @@
 #ifndef _TF_BYTES_H
 #define _TF_BYTES_H 1
 
-#include <stdint.h>
+#include <_stdint.h>
 
 unsigned short get_u16(void *addr);
 unsigned short get_u16_raw(void *addr);