diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2009-07-30 18:15:21 +0000 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2009-07-30 18:15:21 +0000 |
| commit | f6c4c628f33aa999995b6fd11ea2e202c8b5c7d8 (patch) | |
| tree | 4b744b348e65a1c887b07e954c16160c143a2c65 /camlibs/fuji | |
| parent | ea15780bdd129931837b32cc5c2ff12f76fbe83a (diff) | |
| download | libgphoto2-f6c4c628f33aa999995b6fd11ea2e202c8b5c7d8.tar.gz | |
Fixed a bunch of C89 and SUS portability issues.
Fixed a buffer overflow in the AOX driver.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12305 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/fuji')
| -rw-r--r-- | camlibs/fuji/fuji.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camlibs/fuji/fuji.h b/camlibs/fuji/fuji.h index 6379a2594..e239b38c7 100644 --- a/camlibs/fuji/fuji.h +++ b/camlibs/fuji/fuji.h @@ -24,7 +24,6 @@ #include <gphoto2/gphoto2-context.h> #include <gphoto2/gphoto2-camera.h> -typedef enum _FujiCmd FujiCmd; enum _FujiCmd { FUJI_CMD_PIC_GET = 0x02, FUJI_CMD_PIC_GET_THUMB = 0x00, @@ -74,6 +73,7 @@ enum _FujiCmd { FUJI_CMD_UNKNOWN8 = 0xc0 /* Figure this out! */ }; +typedef enum _FujiCmd FujiCmd; int fuji_get_cmds (Camera *camera, unsigned char *cmds, GPContext *context); @@ -114,7 +114,6 @@ int fuji_pic_get (Camera *camera, unsigned int i, unsigned char **data, int fuji_pic_get_thumb (Camera *camera, unsigned int i, unsigned char **data, unsigned int *size, GPContext *context); -typedef enum _FujiSpeed FujiSpeed; enum _FujiSpeed { FUJI_SPEED_9600 = 0, FUJI_SPEED_19200 = 5, @@ -122,6 +121,7 @@ enum _FujiSpeed { FUJI_SPEED_57600 = 7, FUJI_SPEED_115200 = 8 }; +typedef enum _FujiSpeed FujiSpeed; int fuji_set_speed (Camera *camera, FujiSpeed speed, GPContext *context); |