diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-10-05 15:50:32 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-10-05 16:07:20 +0200 |
| commit | 0dbeaf7cbf30ab88ac7aea3e7d3f24df8dc0309f (patch) | |
| tree | 5473eb1125e904a86e479180689167280a2e81dc /camlibs | |
| parent | bacd4128617e1dd613998c0268ded8304cef6f19 (diff) | |
| download | libgphoto2-0dbeaf7cbf30ab88ac7aea3e7d3f24df8dc0309f.tar.gz | |
Use consistently named non-reserved CPP macros for header files
C preprocessor macros beginning/ending with underscores are
reserved for system use as well as macros containing a double
underscore anywhere, so application software macros are
supposed to be named differently.
For a header file gphoto2-abilities-list.h, this
consistently uses a macro name
LIBGPHOTO2_GPHOTO2_ABILITIES_LIST_H
for the usual
#ifndef LIBGPHOTO2_GPHOTO2_ABILITIES_LIST_H
#define LIBGPHOTO2_GPHOTO2_ABILITIES_LIST_H
... content of the header file ...
#endif /* !defined(LIBGPHOTO2_GPHOTO2_ABILITIES_LIST_H) */
Found using "clang -Weverything".
This should work, unless when run with an ancient C preprocessor
which might only the first 8 or 10 characters to distinguish
macro names and ignores the remainder of the name.
Diffstat (limited to 'camlibs')
122 files changed, 454 insertions, 307 deletions
diff --git a/camlibs/aox/aox.h b/camlibs/aox/aox.h index 275df3580..ff3b74a5a 100644 --- a/camlibs/aox/aox.h +++ b/camlibs/aox/aox.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __AOX_H__ -#define __AOX_H__ +#ifndef CAMLIBS_AOX_AOX_H +#define CAMLIBS_AOX_AOX_H #include <gphoto2/gphoto2-port.h> @@ -37,5 +37,5 @@ int aox_get_num_hi_pics (Info *info); int aox_get_picture_size (GPPort *port, int lo, int hi, int n, int k); int aox_read_picture_data (GPPort *port, char *data, int size, int n); -#endif +#endif /* !defined(CAMLIBS_AOX_AOX_H) */ diff --git a/camlibs/ax203/ax203.h b/camlibs/ax203/ax203.h index d1d389093..74d94c32b 100644 --- a/camlibs/ax203/ax203.h +++ b/camlibs/ax203/ax203.h @@ -17,8 +17,10 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ -#ifndef __AX203_H__ -#define __AX203_H__ + +#ifndef CAMLIBS_AX203_AX203_H +#define CAMLIBS_AX203_AX203_H + #include "config.h" #include <stdio.h> @@ -204,4 +206,4 @@ ax206_compress_jpeg(Camera *camera, int **in, uint8_t *outbuf, int out_size, #endif -#endif +#endif /* !defined(CAMLIBS_AX203_AX203_H) */ diff --git a/camlibs/ax203/jpeg_memsrcdest.h b/camlibs/ax203/jpeg_memsrcdest.h index b13bf3f40..674ab7128 100644 --- a/camlibs/ax203/jpeg_memsrcdest.h +++ b/camlibs/ax203/jpeg_memsrcdest.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_AX203_JPEG_MEMSRCDEST_H +#define CAMLIBS_AX203_JPEG_MEMSRCDEST_H + #include <jpeglib.h> #if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) @@ -11,3 +14,5 @@ jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, unsigned long * outsize); #endif + +#endif /* !defined(CAMLIBS_AX203_JPEG_MEMSRCDEST_H) */ diff --git a/camlibs/ax203/tinyjpeg-internal.h b/camlibs/ax203/tinyjpeg-internal.h index 3b209af21..8cf393494 100644 --- a/camlibs/ax203/tinyjpeg-internal.h +++ b/camlibs/ax203/tinyjpeg-internal.h @@ -40,8 +40,8 @@ */ -#ifndef __TINYJPEG_INTERNAL_H_ -#define __TINYJPEG_INTERNAL_H_ +#ifndef CAMLIBS_AX203_TINYJPEG_INTERNAL_H +#define CAMLIBS_AX203_TINYJPEG_INTERNAL_H #include <setjmp.h> @@ -119,4 +119,4 @@ struct jdec_private #define IDCT tinyjpeg_idct_float void tinyjpeg_idct_float (struct component *compptr, uint8_t *output_buf, int stride); -#endif +#endif /* !defined(CAMLIBS_AX203_TINYJPEG_INTERNAL_H) */ diff --git a/camlibs/ax203/tinyjpeg.h b/camlibs/ax203/tinyjpeg.h index f934e4be9..5d93555d7 100644 --- a/camlibs/ax203/tinyjpeg.h +++ b/camlibs/ax203/tinyjpeg.h @@ -40,8 +40,8 @@ */ -#ifndef __JPEGDEC_H__ -#define __JPEGDEC_H__ +#ifndef CAMLIBS_AX203_TINYJPEG_H +#define CAMLIBS_AX203_TINYJPEG_H #ifdef __cplusplus extern "C" { @@ -63,7 +63,7 @@ int tinyjpeg_set_components(struct jdec_private *priv, unsigned char **component } #endif -#endif +#endif /* !defined(CAMLIBS_AX203_TINYJPEG_H) */ diff --git a/camlibs/canon/canon.h b/camlibs/canon/canon.h index 06cec2b3f..1bd41bdb2 100644 --- a/camlibs/canon/canon.h +++ b/camlibs/canon/canon.h @@ -5,8 +5,8 @@ * */ -#ifndef _CANON_H -#define _CANON_H +#ifndef CAMLIBS_CANON_CANON_H +#define CAMLIBS_CANON_CANON_H #ifdef CANON_EXPERIMENTAL_UPLOAD # ifdef __GCC__ @@ -738,7 +738,7 @@ int canon_int_extract_jpeg_thumb (unsigned char *data, const unsigned int datale /* for the macros abbreviating gp_log* */ #define GP_MODULE "canon" -#endif /* _CANON_H */ +#endif /* !defined(CAMLIBS_CANON_CANON_H) */ /* * Local Variables: diff --git a/camlibs/canon/crc.h b/camlibs/canon/crc.h index 0e786ca8e..3c83183ca 100644 --- a/camlibs/canon/crc.h +++ b/camlibs/canon/crc.h @@ -1,7 +1,7 @@ -#ifndef CRC_H -#define CRC_H +#ifndef CAMLIBS_CANON_CRC_H +#define CAMLIBS_CANON_CRC_H int canon_psa50_gen_crc(const unsigned char *pkt, int len); int canon_psa50_chk_crc(const unsigned char *pkt, int len, unsigned short crc); -#endif +#endif /* !defined(CAMLIBS_CANON_CRC_H) */ diff --git a/camlibs/canon/library.h b/camlibs/canon/library.h index 794313c9c..477ae6928 100644 --- a/camlibs/canon/library.h +++ b/camlibs/canon/library.h @@ -4,8 +4,8 @@ * ****************************************************************************/ -#ifndef _LIBRARY_H -#define _LIBRARY_H +#ifndef CAMLIBS_CANON_LIBRARY_H +#define CAMLIBS_CANON_LIBRARY_H /**************************************************************************** * @@ -29,7 +29,7 @@ void clear_readiness(Camera *camera); #define GP_MODULE "canon" -#endif /* _LIBRARY_H */ +#endif /* !defined(CAMLIBS_CANON_LIBRARY_H) */ /**************************************************************************** * diff --git a/camlibs/canon/serial.h b/camlibs/canon/serial.h index b4daaeed8..318a1b5cd 100644 --- a/camlibs/canon/serial.h +++ b/camlibs/canon/serial.h @@ -4,8 +4,8 @@ * ****************************************************************************/ -#ifndef _SERIAL_H -#define _SERIAL_H +#ifndef CAMLIBS_CANON_SERIAL_H +#define CAMLIBS_CANON_SERIAL_H /**************************************************************************** * @@ -312,7 +312,7 @@ typedef enum { -#endif /* _SERIAL_H */ +#endif /* !defined(CAMLIBS_CANON_SERIAL_H) */ /**************************************************************************** * diff --git a/camlibs/canon/usb.h b/camlibs/canon/usb.h index 764b13737..19e559f04 100644 --- a/camlibs/canon/usb.h +++ b/camlibs/canon/usb.h @@ -4,8 +4,8 @@ * ****************************************************************************/ -#ifndef _CANON_USB_H -#define _CANON_USB_H +#ifndef CAMLIBS_CANON_USB_H +#define CAMLIBS_CANON_USB_H /** * USB_BULK_READ_SIZE @@ -282,7 +282,8 @@ int canon_usb_ready (Camera *camera, GPContext *context); int canon_usb_wait_for_event (Camera *camera, int timeout, CameraEventType *eventtype, void **eventdata, GPContext *context); -#endif /* _CANON_USB_H */ + +#endif /* !defined(CAMLIBS_CANON_USB_H) */ /**************************************************************************** * diff --git a/camlibs/canon/util.h b/camlibs/canon/util.h index f95ccbab9..3439b47f0 100644 --- a/camlibs/canon/util.h +++ b/camlibs/canon/util.h @@ -4,8 +4,8 @@ * ****************************************************************************/ -#ifndef _CANON_UTIL_H -#define _CANON_UTIL_H +#ifndef CAMLIBS_CANON_UTIL_H +#define CAMLIBS_CANON_UTIL_H #include "gphoto2-endian.h" @@ -33,7 +33,7 @@ int is_cr2 (const char *name); const char *filename2mimetype(const char *filename); -#endif /* _CANON_UTIL_H */ +#endif /* !defined(CAMLIBS_CANON_UTIL_H) */ /**************************************************************************** * diff --git a/camlibs/casio/camtojpeg.h b/camlibs/casio/camtojpeg.h index 2d724e6e5..9019c0b71 100644 --- a/camlibs/casio/camtojpeg.h +++ b/camlibs/casio/camtojpeg.h @@ -18,10 +18,10 @@ * Boston, MA 02110-1301 USA */ -#ifndef __CASIO_QV_CAMTOJPEG_H__ -#define __CASIO_QV_CAMTOJPEG_H__ +#ifndef CAMLIBS_CASIO_CAMTOJPEG_H +#define CAMLIBS_CASIO_CAMTOJPEG_H int QVcamtojpeg(const unsigned char *cam, long int camSize, unsigned char **jpeg, long int *jpegSize); int QVfinecamtojpeg(const unsigned char *cam, long int camSize, unsigned char **jpeg, long int *jpegSize); -#endif +#endif /* !defined(CAMLIBS_CASIO_CAMTOJPEG_H) */ diff --git a/camlibs/casio/casio-qv-commands.h b/camlibs/casio/casio-qv-commands.h index 2e3cb9007..c68e81464 100644 --- a/camlibs/casio/casio-qv-commands.h +++ b/camlibs/casio/casio-qv-commands.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __CASIO_QV_COMMANDS_H__ -#define __CASIO_QV_COMMANDS_H__ +#ifndef CAMLIBS_CASIO_CASIO_QV_COMMANDS_H +#define CAMLIBS_CASIO_CASIO_QV_COMMANDS_H #include <gphoto2/gphoto2-library.h> @@ -42,4 +42,4 @@ int QVcapture (Camera *camera); int QVreset (Camera *camera); int QVsetspeed (Camera *camera, int speed); -#endif /* __CASIO_QV_COMMANDS_H__ */ +#endif /* !defined(CAMLIBS_CASIO_CASIO_QV_COMMANDS_H) */ diff --git a/camlibs/casio/ycctoppm.h b/camlibs/casio/ycctoppm.h index 0433b5c75..8ddc310e8 100644 --- a/camlibs/casio/ycctoppm.h +++ b/camlibs/casio/ycctoppm.h @@ -18,10 +18,10 @@ * Boston, MA 02110-1301 USA */ -#ifndef __CASIO_QV_YCCTOPPM_H__ -#define __CASIO_QV_YCCTOPPM_H__ +#ifndef CAMLIBS_CASIO_YCCTOPPM_H +#define CAMLIBS_CASIO_YCCTOPPM_H int QVycctoppm(const unsigned char *ycc, long int yccSize, int width, int height, int ratew, unsigned char **ppm, long int *ppmSize); -#endif +#endif /* !defined(CAMLIBS_CASIO_YCCTOPPM_H) */ diff --git a/camlibs/clicksmart310/clicksmart.h b/camlibs/clicksmart310/clicksmart.h index a3dc62cf5..797c75a5d 100644 --- a/camlibs/clicksmart310/clicksmart.h +++ b/camlibs/clicksmart310/clicksmart.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __CLICKSMART_H__ -#define __CLICKSMART_H__ +#ifndef CAMLIBS_CLICKSMART310_CLICKSMART_H +#define CAMLIBS_CLICKSMART310_CLICKSMART_H #include <gphoto2/gphoto2-port.h> @@ -49,4 +49,4 @@ int create_jpeg_from_data (unsigned char * dst, unsigned char * src, int omit_escape); -#endif +#endif /* !defined(CAMLIBS_CLICKSMART310_CLICKSMART_H) */ diff --git a/camlibs/clicksmart310/spca50x-jpeg-header.h b/camlibs/clicksmart310/spca50x-jpeg-header.h index e0038a378..3fbe30891 100644 --- a/camlibs/clicksmart310/spca50x-jpeg-header.h +++ b/camlibs/clicksmart310/spca50x-jpeg-header.h @@ -22,8 +22,8 @@ */ -#ifndef __SPCA50X_JPEG_HEADER_H -#define __SPCA50X_JPEG_HEADER_H +#ifndef CAMLIBS_CLICKSMART310_SPCA50X_JPEG_HEADER_H +#define CAMLIBS_CLICKSMART310_SPCA50X_JPEG_HEADER_H /* * Start from 0 -> 588 @@ -204,4 +204,4 @@ static unsigned char SPCA50xQTable[20][64]= 124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124 } }; -#endif /* __SPCA50X_JPEG_HEADER_H */ +#endif /* !defined(CAMLIBS_CLICKSMART310_SPCA50X_JPEG_HEADER_H) */ diff --git a/camlibs/digigr8/digigr8.h b/camlibs/digigr8/digigr8.h index c03ccc7ac..8201984d9 100644 --- a/camlibs/digigr8/digigr8.h +++ b/camlibs/digigr8/digigr8.h @@ -14,8 +14,8 @@ * COPYING in the main source tree of libgphoto2. */ -#ifndef __DIGIGR8_H__ -#define __DIGIGR8_H__ +#ifndef CAMLIBS_DIGIGR8_DIGIGR8_H +#define CAMLIBS_DIGIGR8_DIGIGR8_H #include <gphoto2/gphoto2-port.h> @@ -49,5 +49,5 @@ int white_balance (unsigned char *data, unsigned int size, float saturation); -#endif +#endif /* !defined(CAMLIBS_DIGIGR8_DIGIGR8_H) */ diff --git a/camlibs/digita/digita.h b/camlibs/digita/digita.h index 542663d07..174e1294e 100644 --- a/camlibs/digita/digita.h +++ b/camlibs/digita/digita.h @@ -19,8 +19,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef DIGITA_H -#define DIGITA_H +#ifndef CAMLIBS_DIGITA_DIGITA_H +#define CAMLIBS_DIGITA_DIGITA_H #include <gphoto2/gphoto2.h> @@ -165,5 +165,5 @@ int digita_serial_open(CameraPrivateLibrary *dev, Camera *camera); /* usb.c */ int digita_usb_open(CameraPrivateLibrary *dev, Camera *camera); -#endif +#endif /* !defined(CAMLIBS_DIGITA_DIGITA_H) */ diff --git a/camlibs/dimera/dimeratab.h b/camlibs/dimera/dimeratab.h index 9e3f97a11..d762ca313 100644 --- a/camlibs/dimera/dimeratab.h +++ b/camlibs/dimera/dimeratab.h @@ -12,8 +12,9 @@ $Id$ */ -#ifndef DIMERATAB_H -#define DIMERATAB_H + +#ifndef CAMLIBS_DIMERA_DIMERATAB_H +#define CAMLIBS_DIMERA_DIMERATAB_H static const unsigned char red_table[256]={ /* 0 */ @@ -120,4 +121,4 @@ static const unsigned char blue_table[256]={ 0xF7,0xF7,0xF7,0xF8,0xF8,0xF8,0xF9,0xF9,0xFA,0xFB,0xFB,0xFC,0xFC,0xFD,0xFD,0xFE, }; -#endif /* DIMERATAB_H */ +#endif /* !defined(CAMLIBS_DIMERA_DIMERATAB_H) */ diff --git a/camlibs/dimera/mesalib.h b/camlibs/dimera/mesalib.h index b707beddd..a1c945665 100644 --- a/camlibs/dimera/mesalib.h +++ b/camlibs/dimera/mesalib.h @@ -9,8 +9,8 @@ * */ -#ifndef MESALIB_H -#define MESALIB_H +#ifndef CAMLIBS_DIMERA_MESALIB_H +#define CAMLIBS_DIMERA_MESALIB_H #include <stdint.h> #include <gphoto2/gphoto2-port.h> @@ -172,4 +172,4 @@ mesa_read_image_info( GPPort *port, int i, struct mesa_image_info *info ); uint8_t * mesa_get_image( GPPort *port, int image ); -#endif /* MESALIB_H */ +#endif /* !defined(CAMLIBS_DIMERA_MESALIB_H) */ diff --git a/camlibs/docupen/docupen.h b/camlibs/docupen/docupen.h index ac45ea9ad..3b9c44603 100644 --- a/camlibs/docupen/docupen.h +++ b/camlibs/docupen/docupen.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_DOCUPEN_DOCUPEN_H +#define CAMLIBS_DOCUPEN_DOCUPEN_H + #include <string.h> #include <stdbool.h> #include <stdint.h> @@ -89,3 +92,5 @@ bool dp_init_calibration(Camera *camera, bool force); gdImagePtr dp_get_image_mono(struct dp_imagehdr *dp, void *data); gdImagePtr dp_get_image_grey(struct dp_imagehdr *dp, void *data, struct lut *lut); gdImagePtr dp_get_image_color(struct dp_imagehdr *dp, void *data, struct lut *lut); + +#endif /* !defined(CAMLIBS_DOCUPEN_DOCUPEN_H) */ diff --git a/camlibs/docupen/huffman.h b/camlibs/docupen/huffman.h index e010e2bf4..35603a641 100644 --- a/camlibs/docupen/huffman.h +++ b/camlibs/docupen/huffman.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_DOCUPEN_HUFFMAN_H +#define CAMLIBS_DOCUPEN_HUFFMAN_H + struct decoder { unsigned char *data; int length; @@ -21,3 +24,5 @@ enum { DECODER_WHITE, DECODER_EOL }; + +#endif /* !defined(CAMLIBS_DOCUPEN_HUFFMAN_H) */ diff --git a/camlibs/fuji/fuji.h b/camlibs/fuji/fuji.h index 13fb9c8d8..87026dd22 100644 --- a/camlibs/fuji/fuji.h +++ b/camlibs/fuji/fuji.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __FUJI_H__ -#define __FUJI_H__ +#ifndef CAMLIBS_FUJI_FUJI_H +#define CAMLIBS_FUJI_FUJI_H #include <gphoto2/gphoto2-context.h> #include <gphoto2/gphoto2-camera.h> @@ -125,4 +125,4 @@ typedef enum _FujiSpeed FujiSpeed; int fuji_set_speed (Camera *camera, FujiSpeed speed, GPContext *context); -#endif /* __FUJI_H__ */ +#endif /* !defined(CAMLIBS_FUJI_FUJI_H) */ diff --git a/camlibs/gsmart300/gsmart300-jpeg-header.h b/camlibs/gsmart300/gsmart300-jpeg-header.h index 2c17d6ce4..33ff0f932 100644 --- a/camlibs/gsmart300/gsmart300-jpeg-header.h +++ b/camlibs/gsmart300/gsmart300-jpeg-header.h @@ -1,5 +1,5 @@ -#ifndef __GSMART_300_JPEG_HEADER_H -#define __GSMART_300_JPEG_HEADER_H +#ifndef CAMLIBS_GSMART300_GSMART300_JPEG_HEADER_H +#define CAMLIBS_GSMART300_GSMART300_JPEG_HEADER_H /* * Start from 0 -> 588 @@ -118,4 +118,4 @@ static uint8_t Gsmart_300_QTable[10][64]= 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59 }, }; -#endif /* __GSMART_300_JPEG_HEADER_H */ +#endif /* !defined(CAMLIBS_GSMART300_GSMART300_JPEG_HEADER_H) */ diff --git a/camlibs/gsmart300/gsmart300.h b/camlibs/gsmart300/gsmart300.h index 1e58f35f4..7451805d7 100644 --- a/camlibs/gsmart300/gsmart300.h +++ b/camlibs/gsmart300/gsmart300.h @@ -25,8 +25,9 @@ /* Boston, MA 02110-1301 USA */ /****************************************************************/ -#ifndef __GSMART300_H__ -#define __GSMART300_H__ +#ifndef CAMLIBS_GSMART300_GSMART300_H +#define CAMLIBS_GSMART300_GSMART300_H + #include <stdint.h> #include <gphoto2/gphoto2-camera.h> @@ -65,4 +66,4 @@ int gsmart300_request_file (CameraPrivateLibrary * lib, CameraFile *file, int gsmart300_request_thumbnail (CameraPrivateLibrary * lib, CameraFile *file, unsigned int number, int *type); -#endif /* __GSMART300_H__ */ +#endif /* !defined(CAMLIBS_GSMART300_GSMART300_H) */ diff --git a/camlibs/hp215/hp215.h b/camlibs/hp215/hp215.h index 67e0211ed..fb57b9422 100644 --- a/camlibs/hp215/hp215.h +++ b/camlibs/hp215/hp215.h @@ -1,5 +1,3 @@ -#ifndef _HP215_H -#define _HP215_H /***************************************************************************** * Copyright (C) 2002 Jason Surprise <thesurprises1@attbi.com> * * 2003 Enno Bartels <ennobartels@t-online.de> * @@ -23,6 +21,9 @@ * Boston, MA 02110-1301 USA * *****************************************************************************/ +#ifndef CAMLIBS_HP215_HP215_H +#define CAMLIBS_HP215_HP215_H + #define STX 0x02 #define ETX 0x03 #define EOT 0x04 @@ -42,4 +43,5 @@ typedef struct unsigned int year; } t_date; -#endif + +#endif /* !defined(CAMLIBS_HP215_HP215_H) */ diff --git a/camlibs/iclick/iclick.h b/camlibs/iclick/iclick.h index 315d30cc9..63136f78e 100644 --- a/camlibs/iclick/iclick.h +++ b/camlibs/iclick/iclick.h @@ -21,8 +21,8 @@ -#ifndef __ICLICK_H__ -#define __ICLICK_H__ +#ifndef CAMLIBS_ICLICK_ICLICK_H +#define CAMLIBS_ICLICK_ICLICK_H #include <gphoto2/gphoto2-port.h> @@ -90,5 +90,5 @@ int icl_get_start (CameraPrivateLibrary *, int entry); int icl_get_size (CameraPrivateLibrary *, int entry); int icl_get_width_height (CameraPrivateLibrary *, int entry, int *w, int *h); -#endif +#endif /* !defined(CAMLIBS_ICLICK_ICLICK_H) */ diff --git a/camlibs/jamcam/library.h b/camlibs/jamcam/library.h index dd5665288..e14e5cd56 100644 --- a/camlibs/jamcam/library.h +++ b/camlibs/jamcam/library.h @@ -23,8 +23,8 @@ /* Boston, MA 02110-1301 USA */ /****************************************************************/ -#ifndef __LIBRARY_H__ -#define __LIBRARY_H__ +#ifndef CAMLIBS_JAMCAM_LIBRARY_H +#define CAMLIBS_JAMCAM_LIBRARY_H #define RETRIES 10 @@ -46,4 +46,4 @@ struct jamcam_file *jamcam_file_info(Camera *camera, int number); int jamcam_request_image(Camera *camera, CameraFile *file, char *buf, unsigned int *len, int number, GPContext *context ); int jamcam_request_thumbnail(Camera *camera, CameraFile *file, char *buf, unsigned int *len, int number, GPContext *context ); -#endif /* __LIBRARY_H__ */ +#endif /* !defined(CAMLIBS_JAMCAM_LIBRARY_H) */ diff --git a/camlibs/jd11/decomp.h b/camlibs/jd11/decomp.h index 819ca025e..0a843a196 100644 --- a/camlibs/jd11/decomp.h +++ b/camlibs/jd11/decomp.h @@ -18,8 +18,10 @@ * Boston, MA 02110-1301 USA */ -#ifndef _JD11_DECOMP_H -#define _JD11_DECOMP_H +#ifndef CAMLIBS_JD11_DECOMP_H +#define CAMLIBS_JD11_DECOMP_H + extern void picture_decomp_v1(unsigned char *compressed,unsigned char *uncompressed,int width,int height); extern void picture_decomp_v2(unsigned char *compressed,unsigned char *uncompressed,int width,int height); -#endif + +#endif /* !defined(CAMLIBS_JD11_DECOMP_H) */ diff --git a/camlibs/jd11/serial.h b/camlibs/jd11/serial.h index 588a87a56..c2247029a 100644 --- a/camlibs/jd11/serial.h +++ b/camlibs/jd11/serial.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef _JD11_SERIAL_H -#define _JD11_SERIAL_H +#ifndef CAMLIBS_JD11_SERIAL_H +#define CAMLIBS_JD11_SERIAL_H #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> @@ -39,4 +39,4 @@ extern int jd11_get_rgb(GPPort *port, float *red, float *green, float *blue); #define IMGHEADER "P6\n# gPhoto2 JD11 thumbnail image\n640 480 255\n" #define THUMBHEADER "P5\n# gPhoto2 JD11 thumbnail image\n64 48 255\n" -#endif +#endif /* !defined(CAMLIBS_JD11_SERIAL_H) */ diff --git a/camlibs/jl2005a/jl2005a.h b/camlibs/jl2005a/jl2005a.h index 4de7d5668..c9ad4d71f 100644 --- a/camlibs/jl2005a/jl2005a.h +++ b/camlibs/jl2005a/jl2005a.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __jl2005a_H__ -#define __jl2005a_H__ +#ifndef CAMLIBS_JL2005A_JL2005A_H +#define CAMLIBS_JL2005A_JL2005A_H #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -52,5 +52,5 @@ int jl2005a_shortquery(GPPort *port, int n); int jl2005a_decompress (unsigned char *inp, unsigned char *outp, int width, int height); -#endif +#endif /* !defined(CAMLIBS_JL2005A_JL2005A_H) */ diff --git a/camlibs/jl2005c/img_enhance.h b/camlibs/jl2005c/img_enhance.h index 76cf8c1ec..8580ecce7 100644 --- a/camlibs/jl2005c/img_enhance.h +++ b/camlibs/jl2005c/img_enhance.h @@ -22,8 +22,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __IMG_ENHANCE_H__ -#define __IMG_ENHANCE_H__ +#ifndef CAMLIBS_JL2005C_IMG_ENHANCE_H +#define CAMLIBS_JL2005C_IMG_ENHANCE_H int @@ -32,4 +32,4 @@ histogram(unsigned char *data, unsigned int size, int *htable_r, int white_balance(unsigned char *data, unsigned int size, float saturation); -#endif +#endif /* !defined(CAMLIBS_JL2005C_IMG_ENHANCE_H) */ diff --git a/camlibs/jl2005c/jl2005bcd_decompress.h b/camlibs/jl2005c/jl2005bcd_decompress.h index e7ba2a938..7011da538 100644 --- a/camlibs/jl2005c/jl2005bcd_decompress.h +++ b/camlibs/jl2005c/jl2005bcd_decompress.h @@ -18,13 +18,13 @@ * Boston, MA 02110-1301 USA */ -#ifndef __jl2005bcd_decompress_H__ -#define __jl2005bcd_decompress_H__ +#ifndef CAMLIBS_JL2005C_JL2005BCD_DECOMPRESS_H +#define CAMLIBS_JL2005C_JL2005BCD_DECOMPRESS_H int jl2005bcd_decompress(unsigned char *output, unsigned char *input, int inputsize, int get_thumbnail); -#endif +#endif /* !defined(CAMLIBS_JL2005C_JL2005BCD_DECOMPRESS_H) */ diff --git a/camlibs/jl2005c/jl2005c.h b/camlibs/jl2005c/jl2005c.h index 457b6fda6..656425f47 100644 --- a/camlibs/jl2005c/jl2005c.h +++ b/camlibs/jl2005c/jl2005c.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __jl2005c_H__ -#define __jl2005c_H__ +#ifndef CAMLIBS_JL2005C_JL2005C_H +#define CAMLIBS_JL2005C_JL2005C_H #include <unistd.h> #include <gphoto2/gphoto2-port.h> @@ -58,5 +58,5 @@ int jl2005c_delete_all (Camera *camera, GPPort *port); -#endif +#endif /* !defined(CAMLIBS_JL2005C_JL2005C_H) */ diff --git a/camlibs/jl2005c/jpeg_memsrcdest.h b/camlibs/jl2005c/jpeg_memsrcdest.h index b13bf3f40..4334e0996 100644 --- a/camlibs/jl2005c/jpeg_memsrcdest.h +++ b/camlibs/jl2005c/jpeg_memsrcdest.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_JL2005C_JPEG_MEMSRCDEST_H +#define CAMLIBS_JL2005C_JPEG_MEMSRCDEST_H + #include <jpeglib.h> #if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) @@ -11,3 +14,5 @@ jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, unsigned long * outsize); #endif + +#endif /* !defined(CAMLIBS_JL2005C_JPEG_MEMSRCDEST_H) */ diff --git a/camlibs/kodak/dc120/dc120.h b/camlibs/kodak/dc120/dc120.h index b5f4e29e5..45bd9f9f2 100644 --- a/camlibs/kodak/dc120/dc120.h +++ b/camlibs/kodak/dc120/dc120.h @@ -101,6 +101,9 @@ */ +#ifndef CAMLIBS_KODAK_DC120_DC120_H +#define CAMLIBS_KODAK_DC120_DC120_H + #define COMM1 (unsigned char)0x00 #define READY (unsigned char)0x10 #define ACK (unsigned char)0xd1 @@ -115,3 +118,5 @@ #define TIMEOUT 5000 #define SLEEP_TIMEOUT 50 #define RETRIES 5 + +#endif /* !defined(CAMLIBS_KODAK_DC120_DC120_H) */ diff --git a/camlibs/kodak/dc120/library.h b/camlibs/kodak/dc120/library.h index 5f2e666d2..dc64eea82 100644 --- a/camlibs/kodak/dc120/library.h +++ b/camlibs/kodak/dc120/library.h @@ -19,8 +19,8 @@ */ -#ifndef _DC120_LIBRARY_H_ -#define _DC120_LIBRARY_H_ +#ifndef CAMLIBS_KODAK_DC120_LIBRARY_H +#define CAMLIBS_KODAK_DC120_LIBRARY_H #define CAMERA_EPOC 852094800 @@ -70,4 +70,4 @@ int dc120_file_action (Camera *camera, int action, int from_card, int album_n int dc120_capture (Camera *camera, CameraFilePath *path, GPContext *context); -#endif /* _DC120_LIBRARY_H_ */ +#endif /* !defined(CAMLIBS_KODAK_DC120_LIBRARY_H) */ diff --git a/camlibs/kodak/dc210/dc210.h b/camlibs/kodak/dc210/dc210.h index 2aed3b6cd..39454c29f 100644 --- a/camlibs/kodak/dc210/dc210.h +++ b/camlibs/kodak/dc210/dc210.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef _DC210_H_ -#define _DC210_H_ +#ifndef CAMLIBS_KODAK_DC210_DC210_H +#define CAMLIBS_KODAK_DC210_DC210_H typedef enum { DC210_TOGGLE_OFF = 0, @@ -235,5 +235,5 @@ int dc210_format_callback(Camera * camera, CameraWidget * widget, GPContext * co int dc210_debug_callback(Camera * camera, CameraWidget * widget, GPContext * context); #endif -#endif /* _DC210_H_ */ +#endif /* !defined(CAMLIBS_KODAK_DC210_DC210_H) */ diff --git a/camlibs/kodak/dc210/library.h b/camlibs/kodak/dc210/library.h index ce044b24a..a176e8b3c 100644 --- a/camlibs/kodak/dc210/library.h +++ b/camlibs/kodak/dc210/library.h @@ -19,8 +19,8 @@ */ -#ifndef _DC210_LIBRARY_H_ -#define _DC210_LIBRARY_H_ +#ifndef CAMLIBS_KODAK_DC210_LIBRARY_H +#define CAMLIBS_KODAK_DC210_LIBRARY_H #define DC210_CMD_OKAY 0 #define DC210_WRITE_ERROR -1 @@ -55,6 +55,6 @@ static int dc210_read_dummy_packet(Camera * camera); static int dc210_test_command(Camera * camera, unsigned char cmdbyte, unsigned char *databytes); #endif -#endif /* _DC210_LIBRARY_H_ */ +#endif /* !defined(CAMLIBS_KODAK_DC210_LIBRARY_H) */ diff --git a/camlibs/kodak/dc240/dc240.h b/camlibs/kodak/dc240/dc240.h index 376bd10be..71b83ef60 100644 --- a/camlibs/kodak/dc240/dc240.h +++ b/camlibs/kodak/dc240/dc240.h @@ -20,9 +20,13 @@ */ +#ifndef CAMLIBS_KODAK_DC240_DC240_H +#define CAMLIBS_KODAK_DC240_DC240_H + #define TIMEOUT 2000 /* 2000 seems to be better than 750 for big CF cards */ #define SLEEP_TIMEOUT 50 #define RETRIES 8 #define HPBS 1024*1 +#endif /* !defined(CAMLIBS_KODAK_DC240_DC240_H) */ diff --git a/camlibs/kodak/dc240/library.h b/camlibs/kodak/dc240/library.h index 376a31f4d..77ca11b72 100644 --- a/camlibs/kodak/dc240/library.h +++ b/camlibs/kodak/dc240/library.h @@ -23,8 +23,8 @@ Kodak DC 240/280/3400/5000 driver. */ -#ifndef __DC240_LIBRARY_H__ -#define __DC240_LIBRARY_H__ +#ifndef CAMLIBS_KODAK_DC240_LIBRARY_H +#define CAMLIBS_KODAK_DC240_LIBRARY_H #define DC240_ACTION_PREVIEW (uint8_t)0x93 #define DC240_ACTION_IMAGE (uint8_t)0x9A @@ -121,4 +121,4 @@ int dc240_capture (Camera *camera, CameraFilePath *path, GPContext *context); int dc240_packet_set_size (Camera *camera, short int size); -#endif /*__DC240_LIBRARY_H__*/ +#endif /* !defined(CAMLIBS_KODAK_DC240_LIBRARY_H) */ diff --git a/camlibs/kodak/dc3200/dc3200.h b/camlibs/kodak/dc3200/dc3200.h index 08a98ebba..d1e384d7a 100644 --- a/camlibs/kodak/dc3200/dc3200.h +++ b/camlibs/kodak/dc3200/dc3200.h @@ -29,8 +29,8 @@ * * ****************************************************/ -#ifndef __DC3200_H__ -#define __DC3200_H__ +#ifndef CAMLIBS_KODAK_DC3200_DC3200_H +#define CAMLIBS_KODAK_DC3200_DC3200_H #include <gphoto2/gphoto2-camera.h> @@ -51,4 +51,4 @@ struct _CameraPrivateLibrary { int check_last_use(Camera *camera); -#endif +#endif /* !defined(CAMLIBS_KODAK_DC3200_DC3200_H) */ diff --git a/camlibs/kodak/dc3200/library.h b/camlibs/kodak/dc3200/library.h index e22ff5d63..2a5f564b8 100644 --- a/camlibs/kodak/dc3200/library.h +++ b/camlibs/kodak/dc3200/library.h @@ -29,8 +29,8 @@ * * ****************************************************/ -#ifndef __LIBRARY_H__ -#define __LIBRARY_H__ +#ifndef CAMLIBS_KODAK_DC3200_LIBRARY_H +#define CAMLIBS_KODAK_DC3200_LIBRARY_H #include <gphoto2/gphoto2-camera.h> @@ -95,4 +95,4 @@ int dc3200_clear_read_buffer(Camera *camera); int dump_buffer(unsigned char * buffer, int len, char *title, int bytesperline); unsigned long bytes_to_l(int a, int b, int c, int d); -#endif +#endif /* !defined(CAMLIBS_KODAK_DC3200_LIBRARY_H) */ diff --git a/camlibs/konica/konica.h b/camlibs/konica/konica.h index 87ce44275..306af024e 100644 --- a/camlibs/konica/konica.h +++ b/camlibs/konica/konica.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __KONICA_H__ -#define __KONICA_H__ +#ifndef CAMLIBS_KONICA_KONICA_H +#define CAMLIBS_KONICA_KONICA_H #include <gphoto2/gphoto2-port.h> #include <gphoto2/gphoto2-context.h> @@ -377,4 +377,4 @@ int k_localization_data_put (GPPort *device, GPContext *, int k_cancel (GPPort *device, GPContext *, KCommand *command); -#endif /* __KONICA_H__ */ +#endif /* !defined(CAMLIBS_KONICA_KONICA_H) */ diff --git a/camlibs/konica/lowlevel.h b/camlibs/konica/lowlevel.h index a0545e768..34b322a46 100644 --- a/camlibs/konica/lowlevel.h +++ b/camlibs/konica/lowlevel.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __KONICA_LOWLEVEL_H__ -#define __KONICA_LOWLEVEL_H__ +#ifndef CAMLIBS_KONICA_LOWLEVEL_H +#define CAMLIBS_KONICA_LOWLEVEL_H #include <gphoto2/gphoto2-port.h> #include <gphoto2/gphoto2-context.h> @@ -52,4 +52,4 @@ int l_send_receive (GPPort *, GPContext *, unsigned int timeout, unsigned char **image_buffer, unsigned int *image_buffer_size); -#endif /* __KONICA_LOWLEVEL_H__ */ +#endif /* !defined(CAMLIBS_KONICA_LOWLEVEL_H) */ diff --git a/camlibs/largan/lmini/lmini.h b/camlibs/largan/lmini/lmini.h index d7555ea2a..7325b7d23 100644 --- a/camlibs/largan/lmini/lmini.h +++ b/camlibs/largan/lmini/lmini.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef _LARGAN_LIBRARY_H_ -#define _LARGAN_LIBRARY_H_ +#ifndef CAMLIBS_LARGAN_LMINI_LMINI_H +#define CAMLIBS_LARGAN_LMINI_LMINI_H #include <gphoto2/gphoto2.h> #include "gphoto2-endian.h" @@ -53,4 +53,5 @@ int largan_get_pict (Camera * camera, largan_pict_type type, uint8_t index, largan_pict_info * pict); int largan_erase (Camera *camera, int all); int largan_capture (Camera *camera); -#endif + +#endif /* !defined(CAMLIBS_LARGAN_LMINI_LMINI_H) */ diff --git a/camlibs/largan/lmini/lmini_ccd.h b/camlibs/largan/lmini/lmini_ccd.h index c2cfb2841..5e840cdc4 100644 --- a/camlibs/largan/lmini/lmini_ccd.h +++ b/camlibs/largan/lmini/lmini_ccd.h @@ -1,7 +1,7 @@ -#ifndef __LARGAN_CCD_H__ -#define __LARGAN_CCD_H__ +#ifndef CAMLIBS_LARGAN_LMINI_LMINI_CCD_H +#define CAMLIBS_LARGAN_LMINI_LMINI_CCD_H void largan_ccd2dib(char *pData, char *pDib, long dwDibRowBytes, int nCcdFactor); -#endif +#endif /* !defined(CAMLIBS_LARGAN_LMINI_LMINI_CCD_H) */ diff --git a/camlibs/lg_gsm/lg_gsm.h b/camlibs/lg_gsm/lg_gsm.h index 182659d68..34eaf9e2e 100644 --- a/camlibs/lg_gsm/lg_gsm.h +++ b/camlibs/lg_gsm/lg_gsm.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __LG_GSM_H__ -#define __LG_GSM_H__ +#ifndef CAMLIBS_LG_GSM_LG_GSM_H +#define CAMLIBS_LG_GSM_LG_GSM_H #include <gphoto2/gphoto2-port.h> @@ -34,5 +34,5 @@ unsigned int lg_gsm_get_picture_size (GPPort *port, int pic); int lg_gsm_read_picture_data (GPPort *port, char *data, unsigned int size, unsigned int n); int lg_gsm_list_files (GPPort *port, CameraList *list); -#endif +#endif /* !defined(CAMLIBS_LG_GSM_LG_GSM_H) */ diff --git a/camlibs/mars/mars.h b/camlibs/mars/mars.h index c6f66b2ab..bb40828bb 100644 --- a/camlibs/mars/mars.h +++ b/camlibs/mars/mars.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __mars_H__ -#define __mars_H__ +#ifndef CAMLIBS_MARS_MARS_H +#define CAMLIBS_MARS_MARS_H #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -50,5 +50,5 @@ int histogram (unsigned char *data, unsigned int size, int *htable_r, int *htable_g, int *htable_b); int mars_white_balance (unsigned char *data, unsigned int size, float saturation, float image_gamma); -#endif +#endif /* !defined(CAMLIBS_MARS_MARS_H) */ diff --git a/camlibs/minolta/dimagev/dimagev.h b/camlibs/minolta/dimagev/dimagev.h index 93e85f5f0..8119b548c 100644 --- a/camlibs/minolta/dimagev/dimagev.h +++ b/camlibs/minolta/dimagev/dimagev.h @@ -21,6 +21,9 @@ /* $Id$ */ +#ifndef CAMLIBS_MINOLTA_DIMAGEV_DIMAGEV_H +#define CAMLIBS_MINOLTA_DIMAGEV_DIMAGEV_H + #if defined HAVE_UNISTD_H #include <unistd.h> #endif @@ -238,3 +241,5 @@ int dimagev_delete_picture(dimagev_t *dimagev, int file_number); int dimagev_delete_all(dimagev_t *dimagev); int dimagev_get_thumbnail(dimagev_t *dimagev, int file_number, CameraFile *file); unsigned char *dimagev_ycbcr_to_ppm(unsigned char *ycbcr); + +#endif /* !defined(CAMLIBS_MINOLTA_DIMAGEV_DIMAGEV_H) */ diff --git a/camlibs/mustek/core.h b/camlibs/mustek/core.h index 780f95f28..3534808ec 100644 --- a/camlibs/mustek/core.h +++ b/camlibs/mustek/core.h @@ -16,8 +16,8 @@ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _MUSTEK_CORE_H -#define _MUSTEK_CORE_H +#ifndef CAMLIBS_MUSTEK_CORE_H +#define CAMLIBS_MUSTEK_CORE_H #include "io.h" #include "mdc800_spec.h" @@ -91,4 +91,5 @@ int mdc800_getExposureMode (Camera*,int *); int mdc800_enableMenu (Camera *,int); int mdc800_number_of_pictures (Camera *camera, int *nrofpics); -#endif + +#endif /* !defined(CAMLIBS_MUSTEK_CORE_H) */ diff --git a/camlibs/mustek/image.h b/camlibs/mustek/image.h index 265ad76e5..41beedf52 100644 --- a/camlibs/mustek/image.h +++ b/camlibs/mustek/image.h @@ -19,10 +19,11 @@ /* * JPeg corrections table */ -#ifndef DEFINE_IMAGE_H -#define DEFINE_IMAGE_H + +#ifndef CAMLIBS_MUSTEK_IMAGE_H +#define CAMLIBS_MUSTEK_IMAGE_H int mdc800_correctImageData (unsigned char*, int,int,int ); -#endif +#endif /* !defined(CAMLIBS_MUSTEK_IMAGE_H) */ diff --git a/camlibs/mustek/io.h b/camlibs/mustek/io.h index d5477719e..c6e46924c 100644 --- a/camlibs/mustek/io.h +++ b/camlibs/mustek/io.h @@ -16,8 +16,8 @@ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _IO_H -#define _IO_H +#ifndef CAMLIBS_MUSTEK_IO_H +#define CAMLIBS_MUSTEK_IO_H /* Maximum Number of tries, before a command is given up */ #define MDC800_DEFAULT_COMMAND_RETRY 4 @@ -45,4 +45,5 @@ int mdc800_io_sendCommand(GPPort *, unsigned char ,unsigned char,unsigned char,u /* Helper Function for rs232 and usb */ int mdc800_io_getCommandTimeout(unsigned char); -#endif + +#endif /* !defined(CAMLIBS_MUSTEK_IO_H) */ diff --git a/camlibs/mustek/mdc800_spec.h b/camlibs/mustek/mdc800_spec.h index a999fc30e..e0059176f 100644 --- a/camlibs/mustek/mdc800_spec.h +++ b/camlibs/mustek/mdc800_spec.h @@ -20,8 +20,8 @@ * Definition of Commands and useful structs. */ -#ifndef DEFINE_MDC800_SPEC_H -#define DEFINE_MDC800_SPEC_H +#ifndef CAMLIBS_MUSTEK_MDC800_SPEC_H +#define CAMLIBS_MUSTEK_MDC800_SPEC_H #define ANSWER_COMMIT 0xbb @@ -69,4 +69,4 @@ #define COMMAND_SET_EXPOSURE_MODE 0x50 #define COMMAND_GET_EXPOSURE_MODE 0x51 -#endif +#endif /* !defined(CAMLIBS_MUSTEK_MDC800_SPEC_H) */ diff --git a/camlibs/mustek/mustek-config.h b/camlibs/mustek/mustek-config.h index d04c4129e..84c19f281 100644 --- a/camlibs/mustek/mustek-config.h +++ b/camlibs/mustek/mustek-config.h @@ -1,7 +1,7 @@ -#ifndef DEFINE_MUSTEK_CONFIG_H -#define DEFINE_MUSTEK_CONFIG_H +#ifndef CAMLIBS_MUSTEK_MUSTEK_CONFIG_H +#define CAMLIBS_MUSTEK_MUSTEK_CONFIG_H int mdc800_configure (); -#endif +#endif /* !defined(CAMLIBS_MUSTEK_MUSTEK_CONFIG_H) */ diff --git a/camlibs/mustek/print.h b/camlibs/mustek/print.h index 4a716e677..ac5b9ec3a 100644 --- a/camlibs/mustek/print.h +++ b/camlibs/mustek/print.h @@ -20,8 +20,10 @@ Defines some PrintMacros. They are need to disable much outputs they were used during development. */ -#ifndef DEFINE_PRINT_H -#define DEFINE_PRINT_H + +#ifndef CAMLIBS_MUSTEK_PRINT_H +#define CAMLIBS_MUSTEK_PRINT_H + #include <stdio.h> /* Message or Errors from the gphoto API */ @@ -40,5 +42,5 @@ #define printCError if (1) printf -#endif +#endif /* !defined(CAMLIBS_MUSTEK_PRINT_H) */ diff --git a/camlibs/mustek/rs232.h b/camlibs/mustek/rs232.h index 163b91c12..73a72f70c 100644 --- a/camlibs/mustek/rs232.h +++ b/camlibs/mustek/rs232.h @@ -15,12 +15,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _RS232_H -#define _RS232_H + +#ifndef CAMLIBS_MUSTEK_RS232_H +#define CAMLIBS_MUSTEK_RS232_H int mdc800_rs232_sendCommand(GPPort*,unsigned char* , unsigned char * , int ); int mdc800_rs232_waitForCommit(GPPort*,char commandid); int mdc800_rs232_receive(GPPort*,unsigned char * , int ); int mdc800_rs232_download(GPPort*,unsigned char *, int); -#endif +#endif /* !defined(CAMLIBS_MUSTEK_RS232_H) */ diff --git a/camlibs/mustek/usb.h b/camlibs/mustek/usb.h index a28b8053d..9e01d1db5 100644 --- a/camlibs/mustek/usb.h +++ b/camlibs/mustek/usb.h @@ -19,8 +19,9 @@ /* Header for USB Interface */ -#ifndef _USB_H -#define _USB_H + +#ifndef CAMLIBS_MUSTEK_USB_H +#define CAMLIBS_MUSTEK_USB_H #define MDC800_USB_ENDPOINT_COMMAND 0x01 #define MDC800_USB_ENDPOINT_STATUS 0x82 @@ -29,4 +30,4 @@ int mdc800_usb_sendCommand (GPPort*,unsigned char* , unsigned char * , int ); -#endif +#endif /* !defined(CAMLIBS_MUSTEK_USB_H) */ diff --git a/camlibs/panasonic/coolshot/library.h b/camlibs/panasonic/coolshot/library.h index 9ee3914e3..73a19715b 100644 --- a/camlibs/panasonic/coolshot/library.h +++ b/camlibs/panasonic/coolshot/library.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_PANASONIC_COOLSHOT_LIBRARY_H +#define CAMLIBS_PANASONIC_COOLSHOT_LIBRARY_H + /****************************************************************/ /* library.h - Gphoto2 library for accessing the Panasonic */ /* Coolshot KXL-600A & KXL-601A digital cameras. */ @@ -33,3 +36,5 @@ int coolshot_file_count (Camera *camera); int coolshot_request_image (Camera *camera, CameraFile *file, char *buf, int *len, int number, GPContext *context); int coolshot_request_thumbnail (Camera *camera, CameraFile *file, char *buf, int *len, int number, GPContext *context); int coolshot_build_thumbnail (char *data, int *size); + +#endif /* !defined(CAMLIBS_PANASONIC_COOLSHOT_LIBRARY_H) */ diff --git a/camlibs/panasonic/dc.h b/camlibs/panasonic/dc.h index b17944224..7937e9d7a 100644 --- a/camlibs/panasonic/dc.h +++ b/camlibs/panasonic/dc.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_PANASONIC_DC_H +#define CAMLIBS_PANASONIC_DC_H + /* $Id$ @@ -112,3 +115,5 @@ void dsc_errorprint(int error, char *file, int line); } /* End of dc.h */ + +#endif /* !defined(CAMLIBS_PANASONIC_DC_H) */ diff --git a/camlibs/panasonic/dc1000.h b/camlibs/panasonic/dc1000.h index 897af4800..b61f8ca87 100644 --- a/camlibs/panasonic/dc1000.h +++ b/camlibs/panasonic/dc1000.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_PANASONIC_DC1000_H +#define CAMLIBS_PANASONIC_DC1000_H + /* $Id$ @@ -48,3 +51,5 @@ #define DSC1_BUF_DATA 17 /* End of dc1000.h */ + +#endif /* !defined(CAMLIBS_PANASONIC_DC1000_H) */ diff --git a/camlibs/panasonic/dc1580.h b/camlibs/panasonic/dc1580.h index da3b80cb6..b156f45f7 100644 --- a/camlibs/panasonic/dc1580.h +++ b/camlibs/panasonic/dc1580.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_PANASONIC_DC1580_H +#define CAMLIBS_PANASONIC_DC1580_H + /* $Id$ @@ -51,3 +54,5 @@ #define DSC2_BUF_CSUM 14 /* End of dc1580.h */ + +#endif /* !defined(CAMLIBS_PANASONIC_DC1580_H) */ diff --git a/camlibs/panasonic/l859/l859.h b/camlibs/panasonic/l859/l859.h index 64c36df42..2a5425806 100644 --- a/camlibs/panasonic/l859/l859.h +++ b/camlibs/panasonic/l859/l859.h @@ -18,8 +18,8 @@ */ -#ifndef __L859_H__ -#define __L859_H__ +#ifndef CAMLIBS_PANASONIC_L859_L859_H +#define CAMLIBS_PANASONIC_L859_L859_H #include <gphoto2/gphoto2-camera.h> @@ -50,4 +50,4 @@ struct _CameraPrivateLibrary { #define L859_CMD_DELETE_ALL 0xef #define L859_CMD_DELETE_ACK 0x15 -#endif /* __L859_H__ */ +#endif /* !defined(CAMLIBS_PANASONIC_L859_L859_H) */ diff --git a/camlibs/pccam300/pccam300.h b/camlibs/pccam300/pccam300.h index 7f73c9f77..ac541adaf 100644 --- a/camlibs/pccam300/pccam300.h +++ b/camlibs/pccam300/pccam300.h @@ -24,8 +24,8 @@ /****************************************************************/ -#ifndef __PCCAM300_H__ -#define __PCCAM300_H__ +#ifndef CAMLIBS_PCCAM300_PCCAM300_H +#define CAMLIBS_PCCAM300_PCCAM300_H #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> @@ -53,4 +53,4 @@ enum { }; -#endif /* __PCCAM300_H__ */ +#endif /* !defined(CAMLIBS_PCCAM300_PCCAM300_H) */ diff --git a/camlibs/pccam600/pccam600.h b/camlibs/pccam600/pccam600.h index 42d7a46db..6a4b574b2 100644 --- a/camlibs/pccam600/pccam600.h +++ b/camlibs/pccam600/pccam600.h @@ -13,8 +13,8 @@ * Author: Peter Kajberg <pbk@odense.kollegienet.dk> */ -#ifndef __PCCAM600_H__ -#define __PCCAM600_H__ +#ifndef CAMLIBS_PCCAM600_PCCAM600_H +#define CAMLIBS_PCCAM600_PCCAM600_H #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> @@ -43,5 +43,6 @@ int pccam600_read_data(GPPort *port, unsigned char *buffer); int pccam600_get_file(GPPort *port, GPContext *context, int index); int pccam600_get_mem_info(GPPort *port, GPContext *context, int *totalmem, int *freemem); -#endif /* __PCCAM600_H__ */ + +#endif /* !defined(CAMLIBS_PCCAM600_PCCAM600_H) */ diff --git a/camlibs/pentax/js0n.h b/camlibs/pentax/js0n.h index 1656113e0..6af66b5cc 100644 --- a/camlibs/pentax/js0n.h +++ b/camlibs/pentax/js0n.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_PENTAX_JS0N_H +#define CAMLIBS_PENTAX_JS0N_H + // key = string to match or null // klen = key length (or 0), or if null key then len is the array offset value // json = json object or array @@ -14,3 +17,5 @@ const char *js0n(const char *key, size_t klen, #ifdef __cplusplus } /* extern "C" */ #endif + +#endif /* !defined(CAMLIBS_PENTAX_JS0N_H) */ diff --git a/camlibs/pentax/pslr.h b/camlibs/pentax/pslr.h index df9c196f8..61baa43c0 100644 --- a/camlibs/pentax/pslr.h +++ b/camlibs/pentax/pslr.h @@ -33,8 +33,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PSLR_H -#define PSLR_H +#ifndef CAMLIBS_PENTAX_PSLR_H +#define CAMLIBS_PENTAX_PSLR_H #include "pslr_enum.h" #include "pslr_scsi.h" @@ -234,4 +234,5 @@ char *copyright(void); void write_debug( const char* message, ... ); int debug_onoff(ipslr_handle_t *p, char debug_mode); -#endif + +#endif /* !defined(CAMLIBS_PENTAX_PSLR_H) */ diff --git a/camlibs/pentax/pslr_enum.h b/camlibs/pentax/pslr_enum.h index 773c1f076..14255bca1 100644 --- a/camlibs/pentax/pslr_enum.h +++ b/camlibs/pentax/pslr_enum.h @@ -26,8 +26,9 @@ and GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PSLR_ENUM_H -#define PSLR_ENUM_H + +#ifndef CAMLIBS_PENTAX_PSLR_ENUM_H +#define CAMLIBS_PENTAX_PSLR_ENUM_H #include <stdint.h> @@ -238,4 +239,4 @@ const char *get_pslr_raw_format_str( pslr_raw_format_t value ); const char *get_pslr_scene_mode_str( pslr_scene_mode_t value ); -#endif +#endif /* !defined(CAMLIBS_PENTAX_PSLR_ENUM_H) */ diff --git a/camlibs/pentax/pslr_lens.h b/camlibs/pentax/pslr_lens.h index cee27ee29..33148bae9 100644 --- a/camlibs/pentax/pslr_lens.h +++ b/camlibs/pentax/pslr_lens.h @@ -25,10 +25,12 @@ and GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PSLR_LENS_H -#define PSLR_LENS_H + +#ifndef CAMLIBS_PENTAX_PSLR_LENS_H +#define CAMLIBS_PENTAX_PSLR_LENS_H #include <stdint.h> const char *get_lens_name( uint32_t id1, uint32_t id2); -#endif + +#endif /* !defined(CAMLIBS_PENTAX_PSLR_LENS_H) */ diff --git a/camlibs/pentax/pslr_model.h b/camlibs/pentax/pslr_model.h index c69b8a621..4fbc11983 100644 --- a/camlibs/pentax/pslr_model.h +++ b/camlibs/pentax/pslr_model.h @@ -32,8 +32,9 @@ and GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PSLR_MODEL_H -#define PSLR_MODEL_H + +#ifndef CAMLIBS_PENTAX_PSLR_MODEL_H +#define CAMLIBS_PENTAX_PSLR_MODEL_H #include "pslr_enum.h" #include "pslr_scsi.h" @@ -210,4 +211,4 @@ void hexdump(uint8_t *buf, uint32_t bufLen); void hexdump_debug(uint8_t *buf, uint32_t bufLen); const char* int_to_binary( uint16_t x ); -#endif +#endif /* !defined(CAMLIBS_PENTAX_PSLR_MODEL_H) */ diff --git a/camlibs/pentax/pslr_scsi.h b/camlibs/pentax/pslr_scsi.h index 9fbed3b78..f3b660815 100644 --- a/camlibs/pentax/pslr_scsi.h +++ b/camlibs/pentax/pslr_scsi.h @@ -24,8 +24,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PSLR_SCSI_H -#define PSLR_SCSI_H +#ifndef CAMLIBS_PENTAX_PSLR_SCSI_H +#define CAMLIBS_PENTAX_PSLR_SCSI_H #include <stdint.h> #include <string.h> @@ -90,4 +90,5 @@ pslr_result get_drive_info(char* drive_name, FDTYPE* device, char* product_id, int product_id_size_max); void close_drive(FDTYPE *device); -#endif + +#endif /* !defined(CAMLIBS_PENTAX_PSLR_SCSI_H) */ diff --git a/camlibs/polaroid/dlink350f.h b/camlibs/polaroid/dlink350f.h index c33fd5d6c..d8d283e25 100644 --- a/camlibs/polaroid/dlink350f.h +++ b/camlibs/polaroid/dlink350f.h @@ -20,7 +20,9 @@ * Boston, MA 02110-1301 USA */ -#ifndef __DLINK350F_H__ -#define __DLINK350F_H__ +#ifndef CAMLIBS_POLAROID_DLINK350F_H +#define CAMLIBS_POLAROID_DLINK350F_H + int dlink_dsc350f_postprocessing_and_flip_both (int width, int height, unsigned char* rgb); -#endif + +#endif /* !defined(CAMLIBS_POLAROID_DLINK350F_H) */ diff --git a/camlibs/polaroid/jd350e.h b/camlibs/polaroid/jd350e.h index 2de3ba309..5568923bd 100644 --- a/camlibs/polaroid/jd350e.h +++ b/camlibs/polaroid/jd350e.h @@ -21,9 +21,11 @@ * Boston, MA 02110-1301 USA */ -#ifndef __JD350E_H__ -#define __JD350E_H__ +#ifndef CAMLIBS_POLAROID_JD350E_H +#define CAMLIBS_POLAROID_JD350E_H + int jd350e_postprocessing(int width, int height, unsigned char* rgb); int jd350e_postprocessing_and_flip(int width, int height, unsigned char* rgb); int trust350fs_postprocessing(int width, int height, unsigned char* rgb); -#endif + +#endif /* !defined(CAMLIBS_POLAROID_JD350E_H) */ diff --git a/camlibs/polaroid/jd350e_blue.h b/camlibs/polaroid/jd350e_blue.h index 07c1229ba..2aa66a93e 100644 --- a/camlibs/polaroid/jd350e_blue.h +++ b/camlibs/polaroid/jd350e_blue.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_POLAROID_JD350E_BLUE_H +#define CAMLIBS_POLAROID_JD350E_BLUE_H + /* jd350e_blue.h * * White balancing curve for indoor / electric light pictures @@ -85,3 +88,5 @@ static unsigned jd350e_blue_curve [] = { 252, 252, 253, 253, 253, 253, 253, 254, 254, 254, 254, 255}; + +#endif /* !defined(CAMLIBS_POLAROID_JD350E_BLUE_H) */ diff --git a/camlibs/polaroid/jd350e_red.h b/camlibs/polaroid/jd350e_red.h index 29773246d..347689f99 100644 --- a/camlibs/polaroid/jd350e_red.h +++ b/camlibs/polaroid/jd350e_red.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_POLAROID_JD350E_RED_H +#define CAMLIBS_POLAROID_JD350E_RED_H + /* jd350e_red.h * * White balancing curve for daylight images (experimental) @@ -85,3 +88,5 @@ 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 255}; + +#endif /* !defined(CAMLIBS_POLAROID_JD350E_RED_H) */ diff --git a/camlibs/polaroid/jpeghead.h b/camlibs/polaroid/jpeghead.h index cf329a3d3..ccee8ea32 100644 --- a/camlibs/polaroid/jpeghead.h +++ b/camlibs/polaroid/jpeghead.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_POLAROID_JPEGHEAD_H +#define CAMLIBS_POLAROID_JPEGHEAD_H + /* This file was added by Nathan Stenzel <nathanstenzel@users.sourceforge.net> It will only get rough rough images, but might do for now I may be working on the header by decoding the image into a stream "manually" @@ -166,3 +169,5 @@ Start Of Scan: 3 components * I used this info to comment the jpeg header above * I honestly still don't understand it very well */ + +#endif /* !defined(CAMLIBS_POLAROID_JPEGHEAD_H) */ diff --git a/camlibs/polaroid/pdc320.h b/camlibs/polaroid/pdc320.h index f57c0c407..6208dc8f5 100644 --- a/camlibs/polaroid/pdc320.h +++ b/camlibs/polaroid/pdc320.h @@ -1,5 +1,5 @@ -#ifndef __GPHOTO2_PDC320_H__ -#define __GPHOTO2_PDC320_H__ +#ifndef CAMLIBS_POLAROID_PDC320_H +#define CAMLIBS_POLAROID_PDC320_H #include <jpeg.h> @@ -70,4 +70,5 @@ static struct { "\xBA\xC2\xC3\xC4\xC5\xC6\xC7\xC8" "\xC9\xCA\xD2\xD3\xD4\xD5\xD6\xD7" \ "\xD8\xD9\xDA\xE1\xE2\xE3\xE4\xE5" "\xE6\xE7\xE8\xE9\xEA\xF1\xF2\xF3" \ "\xF4\xF5\xF6\xF7\xF8\xF9\xFA" -#endif + +#endif /* !defined(CAMLIBS_POLAROID_PDC320_H) */ diff --git a/camlibs/ptp2/chdk_live_view.h b/camlibs/ptp2/chdk_live_view.h index d45e40fef..59eb3b9ff 100644 --- a/camlibs/ptp2/chdk_live_view.h +++ b/camlibs/ptp2/chdk_live_view.h @@ -1,5 +1,5 @@ -#ifndef __LIVE_VIEW_H -#define __LIVE_VIEW_H +#ifndef CAMLIBS_PTP2_CHDK_LIVE_VIEW_H +#define CAMLIBS_PTP2_CHDK_LIVE_VIEW_H // Note: used in modules and platform independent code. // Do not add platform dependent stuff in here (#ifdef/#endif compile options or camera dependent values) @@ -107,4 +107,4 @@ typedef struct { int bmo_desc_start; // added in protocol 2.2 } lv_data_header; -#endif // __LIVE_VIEW_H +#endif /* !defined(CAMLIBS_PTP2_CHDK_LIVE_VIEW_H) */ diff --git a/camlibs/ptp2/chdk_ptp.h b/camlibs/ptp2/chdk_ptp.h index 8adbd2717..5c8d60923 100644 --- a/camlibs/ptp2/chdk_ptp.h +++ b/camlibs/ptp2/chdk_ptp.h @@ -1,5 +1,5 @@ -#ifndef __CHDK_PTP_H -#define __CHDK_PTP_H +#ifndef CAMLIBS_PTP2_CHDK_PTP_H +#define CAMLIBS_PTP2_CHDK_PTP_H // CHDK PTP protocol interface (can also be used in client PTP programs) @@ -627,4 +627,4 @@ enum ptp_chdk_script_msg_status { PTP_CHDK_S_MSGSTATUS_BADID, // specified ID is not running }; -#endif // __CHDK_PTP_H +#endif /* !defined(CAMLIBS_PTP2_CHDK_PTP_H) */ diff --git a/camlibs/ptp2/olympus-wrap.h b/camlibs/ptp2/olympus-wrap.h index 28c404e7a..f55350d10 100644 --- a/camlibs/ptp2/olympus-wrap.h +++ b/camlibs/ptp2/olympus-wrap.h @@ -18,11 +18,11 @@ * Boston, MA 02110-1301 USA */ -#ifndef __OLYMPUS_USBWRAP_H__ -#define __OLYMPUS_USBWRAP_H__ +#ifndef CAMLIBS_PTP2_OLYMPUS_WRAP_H +#define CAMLIBS_PTP2_OLYMPUS_WRAP_H #include <gphoto2/gphoto2-port.h> uint16_t olympus_setup (PTPParams *params); -#endif /* __OLYMPUS_USBWRAP_H__ */ +#endif /* !defined(CAMLIBS_PTP2_OLYMPUS_WRAP_H) */ diff --git a/camlibs/ptp2/ptp-bugs.h b/camlibs/ptp2/ptp-bugs.h index f627523f4..b73a46a6a 100644 --- a/camlibs/ptp2/ptp-bugs.h +++ b/camlibs/ptp2/ptp-bugs.h @@ -19,8 +19,8 @@ */ -#ifndef __PTP_BUGS_H_ -#define __PTP_BUGS_H_ +#ifndef CAMLIBS_PTP2_PTP_BUGS_H +#define CAMLIBS_PTP2_PTP_BUGS_H #include "device-flags.h" @@ -47,4 +47,4 @@ #define MTP_ZEN_BROKEN_HEADER(x) \ ((x)->device_flags & (DEVICE_FLAG_IGNORE_HEADER_ERRORS)) -#endif +#endif /* !defined(CAMLIBS_PTP2_PTP_BUGS_H) */ diff --git a/camlibs/ptp2/ptp-private.h b/camlibs/ptp2/ptp-private.h index 66205bce3..5b4f309ac 100644 --- a/camlibs/ptp2/ptp-private.h +++ b/camlibs/ptp2/ptp-private.h @@ -18,6 +18,9 @@ * Boston, MA 02110-1301 USA */ +#ifndef CAMLIBS_PTP2_PTP_PRIVATE_H +#define CAMLIBS_PTP2_PTP_PRIVATE_H + /* ptp2 camlib private functions */ #include <gphoto2/gphoto2-library.h> @@ -162,3 +165,5 @@ struct _PTPData { GPContext *context; }; typedef struct _PTPData PTPData; + +#endif /* !defined(CAMLIBS_PTP2_PTP_PRIVATE_H) */ diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h index 3a15fb568..4b1be41ed 100644 --- a/camlibs/ptp2/ptp.h +++ b/camlibs/ptp2/ptp.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __PTP_H__ -#define __PTP_H__ +#ifndef CAMLIBS_PTP2_PTP_H +#define CAMLIBS_PTP2_PTP_H #include <stdarg.h> #include <time.h> @@ -4859,4 +4859,4 @@ uint16_t ptp_leica_getstreamdata (PTPParams* params, unsigned char **data, unsig } #endif /* __cplusplus */ -#endif /* __PTP_H__ */ +#endif /* !defined(CAMLIBS_PTP2_PTP_H) */ diff --git a/camlibs/ptp2/ptpip-private.h b/camlibs/ptp2/ptpip-private.h index 6019f549e..4e2bd912b 100644 --- a/camlibs/ptp2/ptpip-private.h +++ b/camlibs/ptp2/ptpip-private.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef PTPIP_PRIVATE_H -#define PTPIP_PRIVATE_H +#ifndef CAMLIBS_PTP2_PTPIP_PRIVATE_H +#define CAMLIBS_PTP2_PTPIP_PRIVATE_H /* Definitions for PTP/IP to work with WinSock and regular BSD-style sockets */ #ifdef WIN32 @@ -56,4 +56,4 @@ void ptpip_perror(const char *what); int ptpip_get_socket_error(void); void ptpip_set_socket_error(int err); -#endif +#endif /* !defined(CAMLIBS_PTP2_PTPIP_PRIVATE_H) */ diff --git a/camlibs/ricoh/ricoh.h b/camlibs/ricoh/ricoh.h index 531e36064..6b5c546ac 100644 --- a/camlibs/ricoh/ricoh.h +++ b/camlibs/ricoh/ricoh.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __RICOH_H__ -#define __RICOH_H__ +#ifndef CAMLIBS_RICOH_RICOH_H +#define CAMLIBS_RICOH_RICOH_H #include <time.h> @@ -200,4 +200,4 @@ typedef enum _RicohCompression RicohCompression; int ricoh_get_compression (Camera *, GPContext *, RicohCompression *); int ricoh_set_compression (Camera *, GPContext *, RicohCompression); -#endif /* __RICOH_H__ */ +#endif /* !defined(CAMLIBS_RICOH_RICOH_H) */ diff --git a/camlibs/sierra/library.h b/camlibs/sierra/library.h index 4ca1eb672..20f7f36c9 100644 --- a/camlibs/sierra/library.h +++ b/camlibs/sierra/library.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __LIBRARY_H__ -#define __LIBRARY_H__ +#ifndef CAMLIBS_SIERRA_LIBRARY_H +#define CAMLIBS_SIERRA_LIBRARY_H #include <gphoto2/gphoto2-camera.h> @@ -151,4 +151,5 @@ int camera_set_config_cam_desc (Camera *camera, CameraWidget *window, GPContext *context); int camera_get_config_cam_desc (Camera *camera, CameraWidget **window, GPContext *context); -#endif /* __LIBRARY_H__ */ + +#endif /* !defined(CAMLIBS_SIERRA_LIBRARY_H) */ diff --git a/camlibs/sierra/sierra-desc.h b/camlibs/sierra/sierra-desc.h index cf0d4c37e..09ef06d2a 100644 --- a/camlibs/sierra/sierra-desc.h +++ b/camlibs/sierra/sierra-desc.h @@ -35,8 +35,8 @@ * description (string). */ -#ifndef __SIERRA_DESC_H__ -#define __SIERRA_DESC_H__ +#ifndef CAMLIBS_SIERRA_SIERRA_DESC_H +#define CAMLIBS_SIERRA_SIERRA_DESC_H #define SIZE_ADDR(type, var) (sizeof(var)/sizeof(type)), (type*) var @@ -153,4 +153,4 @@ extern const CameraDescType cp4300_cam_desc; */ extern const CameraDescType ep3000z_cam_desc; -#endif /* __SIERRA_DESC_H__ */ +#endif /* !defined(CAMLIBS_SIERRA_SIERRA_DESC_H) */ diff --git a/camlibs/sierra/sierra-usbwrap.h b/camlibs/sierra/sierra-usbwrap.h index 33fd75b6f..576fe8af6 100644 --- a/camlibs/sierra/sierra-usbwrap.h +++ b/camlibs/sierra/sierra-usbwrap.h @@ -18,12 +18,12 @@ * Boston, MA 02110-1301 USA */ -#ifndef __SIERRA_USBWRAP_H__ -#define __SIERRA_USBWRAP_H__ +#ifndef CAMLIBS_SIERRA_SIERRA_USBWRAP_H +#define CAMLIBS_SIERRA_SIERRA_USBWRAP_H #include <gphoto2/gphoto2-port.h> int usb_wrap_write_packet (GPPort *dev, unsigned int type, char *sierra_msg, int sierra_len); int usb_wrap_read_packet (GPPort *dev, unsigned int type, char *sierra_response, int sierra_len); -#endif /* __SIERRA_USBWRAP_H__ */ +#endif /* !defined(CAMLIBS_SIERRA_SIERRA_USBWRAP_H) */ diff --git a/camlibs/sierra/sierra.h b/camlibs/sierra/sierra.h index 539d187f5..c0224e71e 100644 --- a/camlibs/sierra/sierra.h +++ b/camlibs/sierra/sierra.h @@ -17,6 +17,10 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ + +#ifndef CAMLIBS_SIERRA_SIERRA_H +#define CAMLIBS_SIERRA_SIERRA_H + typedef enum { SIERRA_MODEL_DEFAULT, SIERRA_MODEL_EPSON, @@ -64,3 +68,5 @@ struct CameraDescriptor; return (res); \ } \ } + +#endif /* !defined(CAMLIBS_SIERRA_SIERRA_H) */ diff --git a/camlibs/smal/smal.h b/camlibs/smal/smal.h index 46677dd88..dc4715c74 100644 --- a/camlibs/smal/smal.h +++ b/camlibs/smal/smal.h @@ -17,9 +17,9 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ -#ifndef __SMAL_H__ -#define __SMAL_H__ 1 +#ifndef CAMLIBS_SMAL_SMAL_H +#define CAMLIBS_SMAL_SMAL_H #define USB_VENDOR_ID_SMAL 0x0dca #define USB_DEVICE_ID_ULTRAPOCKET 0x0002 @@ -45,5 +45,4 @@ struct _CameraPrivateLibrary { up_badge_type up_type; }; - -#endif +#endif /* !defined(CAMLIBS_SMAL_SMAL_H) */ diff --git a/camlibs/smal/ultrapocket.h b/camlibs/smal/ultrapocket.h index 5d193c7fe..28bd46295 100644 --- a/camlibs/smal/ultrapocket.h +++ b/camlibs/smal/ultrapocket.h @@ -17,9 +17,9 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ -#ifndef __ULTRAPOCKET_H__ -#define __ULTRAPOCKET_H__ 1 +#ifndef CAMLIBS_SMAL_ULTRAPOCKET_H +#define CAMLIBS_SMAL_ULTRAPOCKET_H #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-result.h> @@ -47,4 +47,4 @@ int ultrapocket_getpicture(Camera *camera, GPContext *context, unsigned char **p int ultrapocket_deletefile(Camera *camera, const char *filename); int ultrapocket_deleteall(Camera *camera); -#endif +#endif /* !defined(CAMLIBS_SMAL_ULTRAPOCKET_H) */ diff --git a/camlibs/sonix/sakar-avi-header.h b/camlibs/sonix/sakar-avi-header.h index 1b52dbb01..e164c42d6 100644 --- a/camlibs/sonix/sakar-avi-header.h +++ b/camlibs/sonix/sakar-avi-header.h @@ -1,5 +1,5 @@ -#ifndef __SAKAR_AVI_HEADER_H -#define __SAKAR_AVI_HEADER_H +#ifndef CAMLIBS_SONIX_SAKAR_AVI_HEADER_H +#define CAMLIBS_SONIX_SAKAR_AVI_HEADER_H #define SAKAR_AVI_FRAME_HEADER_LENGTH 8 static const unsigned char SakarAviFrameHeader[SAKAR_AVI_FRAME_HEADER_LENGTH] = { @@ -73,4 +73,4 @@ static const unsigned char SakarAviHeader[SAKAR_AVI_HEADER_LENGTH] = { 0x6D, 0x6F, 0x76, 0x69 /* 0xda: movi */ }; -#endif /* __SAKAR_AVI_HEADER_H */ +#endif /* !defined(CAMLIBS_SONIX_SAKAR_AVI_HEADER_H) */ diff --git a/camlibs/sonix/sonix.h b/camlibs/sonix/sonix.h index b13981c0b..8af1af04c 100644 --- a/camlibs/sonix/sonix.h +++ b/camlibs/sonix/sonix.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __SONIX_H__ -#define __SONIX_H__ +#ifndef CAMLIBS_SONIX_SONIX_H +#define CAMLIBS_SONIX_SONIX_H #include <gphoto2/gphoto2-port.h> @@ -55,5 +55,5 @@ int sonix_rows_reverse (unsigned char *imagedata, int width, int height); int sonix_cols_reverse (unsigned char *imagedata, int width, int height); int white_balance (unsigned char *data, unsigned int size, float saturation); -#endif +#endif /* !defined(CAMLIBS_SONIX_SONIX_H) */ diff --git a/camlibs/sonydscf1/command.h b/camlibs/sonydscf1/command.h index 0596fa6e0..2c4a72a15 100644 --- a/camlibs/sonydscf1/command.h +++ b/camlibs/sonydscf1/command.h @@ -21,8 +21,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __COMMAND_H__ -#define __COMMAND_H__ +#ifndef CAMLIBS_SONYDSCF1_COMMAND_H +#define CAMLIBS_SONYDSCF1_COMMAND_H int F1ok (GPPort*); long F1getdata (GPPort*,char *, unsigned char *); @@ -36,4 +36,5 @@ long F1fseek (GPPort *,long, int); unsigned long F1finfo (GPPort *,char *); int F1fclose (GPPort *); int F1deletepicture (GPPort*,int); -#endif /* __COMMAND_H__ */ + +#endif /* !defined(CAMLIBS_SONYDSCF1_COMMAND_H) */ diff --git a/camlibs/sonydscf1/pmp.h b/camlibs/sonydscf1/pmp.h index 7c9784910..e5009d747 100644 --- a/camlibs/sonydscf1/pmp.h +++ b/camlibs/sonydscf1/pmp.h @@ -1,3 +1,6 @@ +#ifndef CAMLIBS_SONYDSCF1_PMP_H +#define CAMLIBS_SONYDSCF1_PMP_H + /* pmp.h * * Copyright (C) M. Adam Kendall <joker@penguinpub.com> @@ -45,3 +48,5 @@ #define PMP_SPEED 0x66 #define PMP_FLASH 0x76 + +#endif /* !defined(CAMLIBS_SONYDSCF1_PMP_H) */ diff --git a/camlibs/sonydscf55/nls.h b/camlibs/sonydscf55/nls.h index 46685f39c..e71f06b3c 100644 --- a/camlibs/sonydscf55/nls.h +++ b/camlibs/sonydscf55/nls.h @@ -16,8 +16,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef NLS_H -#define NLS_H +#ifndef CAMLIBS_SONYDSCF55_NLS_H +#define CAMLIBS_SONYDSCF55_NLS_H #ifdef ENABLE_NLS # include <libintl.h> @@ -38,4 +38,4 @@ # define N_(String) (String) #endif -#endif /* NLS_H */ +#endif /* !defined(CAMLIBS_SONYDSCF55_NLS_H) */ diff --git a/camlibs/sonydscf55/sony.h b/camlibs/sonydscf55/sony.h index c3c9b4375..f5ec0835d 100644 --- a/camlibs/sonydscf55/sony.h +++ b/camlibs/sonydscf55/sony.h @@ -17,8 +17,9 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ -#ifndef SONY_H -#define SONY_H + +#ifndef CAMLIBS_SONYDSCF55_SONY_H +#define CAMLIBS_SONYDSCF55_SONY_H #define SONY_CAMERA_ID "sonydscf55" @@ -66,7 +67,7 @@ int sony_image_info(Camera * camera, int imageid, SonyFileType file_type, Camera int sony_file_name_get(Camera *camera, int imageid, SonyFileType file_type, char buf[13]); int sony_is_mpeg_file_name(const char * file_name); -#endif /* SONY_H */ +#endif /* !defined(CAMLIBS_SONYDSCF55_SONY_H) */ /* * Local Variables: diff --git a/camlibs/soundvision/commands.h b/camlibs/soundvision/commands.h index 49d6bf9ca..eae760242 100644 --- a/camlibs/soundvision/commands.h +++ b/camlibs/soundvision/commands.h @@ -16,8 +16,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef commands_H -#define commands_H +#ifndef CAMLIBS_SOUNDVISION_COMMANDS_H +#define CAMLIBS_SOUNDVISION_COMMANDS_H int32_t soundvision_send_command(uint32_t command, uint32_t argument, @@ -28,4 +28,4 @@ int32_t soundvision_send_file_command(const char *filename, int32_t soundvision_read(CameraPrivateLibrary *dev, void *buffer, int len); -#endif +#endif /* !defined(CAMLIBS_SOUNDVISION_COMMANDS_H) */ diff --git a/camlibs/soundvision/soundvision.h b/camlibs/soundvision/soundvision.h index e533cc814..30c4c78f3 100644 --- a/camlibs/soundvision/soundvision.h +++ b/camlibs/soundvision/soundvision.h @@ -14,8 +14,9 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ -#ifndef soundvision_H -#define soundvision_H + +#ifndef CAMLIBS_SOUNDVISION_SOUNDVISION_H +#define CAMLIBS_SOUNDVISION_SOUNDVISION_H #include <stdint.h> @@ -117,5 +118,6 @@ int tiger_get_pic_size(CameraPrivateLibrary *dev, const char *filename); int tiger_get_thumb(CameraPrivateLibrary *dev, const char *filename, unsigned char *data,int size); int tiger_get_thumb_size(CameraPrivateLibrary *dev, const char *filename); -#endif + +#endif /* !defined(CAMLIBS_SOUNDVISION_SOUNDVISION_H) */ diff --git a/camlibs/spca50x/spca50x-avi-header.h b/camlibs/spca50x/spca50x-avi-header.h index 4d1c13511..0764a0255 100644 --- a/camlibs/spca50x/spca50x-avi-header.h +++ b/camlibs/spca50x/spca50x-avi-header.h @@ -1,5 +1,5 @@ -#ifndef __SPCA50X_AVI_HEADER_H -#define __SPCA50X_AVI_HEADER_H +#ifndef CAMLIBS_SPCA50X_SPCA50X_AVI_HEADER_H +#define CAMLIBS_SPCA50X_SPCA50X_AVI_HEADER_H #define SPCA50X_AVI_FRAME_HEADER_LENGTH 8 static const uint8_t SPCA50xAviFrameHeader[SPCA50X_AVI_FRAME_HEADER_LENGTH] = { @@ -73,4 +73,4 @@ static const uint8_t SPCA50xAviHeader[SPCA50X_AVI_HEADER_LENGTH] = { 0x6D, 0x6F, 0x76, 0x69 /* 0xda: movi */ }; -#endif /* __SPCA50X_AVI_HEADER_H */ +#endif /* !defined(CAMLIBS_SPCA50X_SPCA50X_AVI_HEADER_H) */ diff --git a/camlibs/spca50x/spca50x-flash.h b/camlibs/spca50x/spca50x-flash.h index 705b3ae1f..19f624af4 100644 --- a/camlibs/spca50x/spca50x-flash.h +++ b/camlibs/spca50x/spca50x-flash.h @@ -14,8 +14,8 @@ * based on work by: Mark A. Zimmerman <mark@foresthaven.com> */ -#ifndef __SPCA50X_FLASH_H__ -#define __SPCA50X_FLASH_H__ +#ifndef CAMLIBS_SPCA50X_SPCA50X_FLASH_H +#define CAMLIBS_SPCA50X_SPCA50X_FLASH_H #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> @@ -39,4 +39,4 @@ int spca50x_flash_delete_all (CameraPrivateLibrary *pl, GPContext *context); int spca500_flash_delete_file (CameraPrivateLibrary *pl, int index); int spca500_flash_capture (CameraPrivateLibrary *pl); -#endif +#endif /* !defined(CAMLIBS_SPCA50X_SPCA50X_FLASH_H) */ diff --git a/camlibs/spca50x/spca50x-jpeg-header.h b/camlibs/spca50x/spca50x-jpeg-header.h index de6c37e55..a9ea5ce3b 100644 --- a/camlibs/spca50x/spca50x-jpeg-header.h +++ b/camlibs/spca50x/spca50x-jpeg-header.h @@ -1,5 +1,5 @@ -#ifndef __SPCA50X_JPEG_HEADER_H -#define __SPCA50X_JPEG_HEADER_H +#ifndef CAMLIBS_SPCA50X_SPCA50X_JPEG_HEADER_H +#define CAMLIBS_SPCA50X_SPCA50X_JPEG_HEADER_H /* * Start from 0 -> 588 @@ -175,4 +175,5 @@ static const uint8_t SPCA50xQTable[20][64]= 124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, 124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124 } }; -#endif /* __SPCA50X_JPEG_HEADER_H */ + +#endif /* !defined(CAMLIBS_SPCA50X_SPCA50X_JPEG_HEADER_H) */ diff --git a/camlibs/spca50x/spca50x-registers.h b/camlibs/spca50x/spca50x-registers.h index f1fd911d4..619f2724c 100644 --- a/camlibs/spca50x/spca50x-registers.h +++ b/camlibs/spca50x/spca50x-registers.h @@ -24,8 +24,8 @@ /* Boston, MA 02110-1301 USA */ /****************************************************************/ -#ifndef __SPCA50X_REGISTERS_H__ -#define __SPCA50X_REGISTERS_H__ +#ifndef CAMLIBS_SPCA50X_SPCA50X_REGISTERS_H +#define CAMLIBS_SPCA50X_SPCA50X_REGISTERS_H /* ---- Register ---- */ @@ -81,4 +81,4 @@ SPCA50xCamMode; #define SPCA50X_REG_I2C_rStatus 0x2a06 -#endif /* __SPCA50X_REGISTERS_H__ */ +#endif /* !defined(CAMLIBS_SPCA50X_SPCA50X_REGISTERS_H) */ diff --git a/camlibs/spca50x/spca50x-sdram.h b/camlibs/spca50x/spca50x-sdram.h index b5bad4dee..85f1f674e 100644 --- a/camlibs/spca50x/spca50x-sdram.h +++ b/camlibs/spca50x/spca50x-sdram.h @@ -24,8 +24,9 @@ /* Boston, MA 02110-1301 USA */ /****************************************************************/ -#ifndef __SPCA50X_SDRAM_H__ -#define __SPCA50X_SDRAM_H__ +#ifndef CAMLIBS_SPCA50X_SPCA50X_SDRAM_H +#define CAMLIBS_SPCA50X_SPCA50X_SDRAM_H + #include <gphoto2/gphoto2-camera.h> int spca50x_sdram_get_info (CameraPrivateLibrary * lib); @@ -39,4 +40,4 @@ int spca50x_sdram_request_thumbnail (CameraPrivateLibrary * lib, uint8_t ** buf, unsigned int *len, unsigned int number, int *type); -#endif /* __SPCA50X_SDRAM_H__ */ +#endif /* !defined(CAMLIBS_SPCA50X_SPCA50X_SDRAM_H) */ diff --git a/camlibs/spca50x/spca50x.h b/camlibs/spca50x/spca50x.h index 072759178..9331f48f7 100644 --- a/camlibs/spca50x/spca50x.h +++ b/camlibs/spca50x/spca50x.h @@ -24,8 +24,9 @@ /* Boston, MA 02110-1301 USA */ /****************************************************************/ -#ifndef __SPCA50X_H__ -#define __SPCA50X_H__ +#ifndef CAMLIBS_SPCA50X_SPCA50X_H +#define CAMLIBS_SPCA50X_SPCA50X_H + #include <stdint.h> #include <gphoto2/gphoto2-camera.h> @@ -91,4 +92,4 @@ int create_jpeg_from_data (uint8_t * dst, uint8_t * src, unsigned int qIndex, int original_size, int *size, int omit_huffman_table, int omit_escape); -#endif /* __SPCA50X_H__ */ +#endif /* !defined(CAMLIBS_SPCA50X_SPCA50X_H) */ diff --git a/camlibs/sq905/sq905.h b/camlibs/sq905/sq905.h index 1ba9ddb30..5475ecfa9 100644 --- a/camlibs/sq905/sq905.h +++ b/camlibs/sq905/sq905.h @@ -1,5 +1,5 @@ -#ifndef __SQ905_H__ -#define __SQ905_H__ +#ifndef CAMLIBS_SQ905_SQ905_H +#define CAMLIBS_SQ905_SQ905_H #include <gphoto2/gphoto2-port.h> @@ -58,5 +58,6 @@ sq_preprocess (SQModel model, int comp_ratio, int sq_decompress (SQModel model, unsigned char *output, unsigned char *data, int w, int h); -#endif + +#endif /* !defined(CAMLIBS_SQ905_SQ905_H) */ diff --git a/camlibs/st2205/st2205.h b/camlibs/st2205/st2205.h index dc55786ee..7c680e000 100644 --- a/camlibs/st2205/st2205.h +++ b/camlibs/st2205/st2205.h @@ -17,8 +17,10 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ -#ifndef __ST2205_H__ -#define __ST2205_H__ + +#ifndef CAMLIBS_ST2205_ST2205_H +#define CAMLIBS_ST2205_ST2205_H + #include "config.h" #include <stdio.h> @@ -184,4 +186,4 @@ int st2205_rgb24_to_rgb565(CameraPrivateLibrary *pl, int **src, unsigned char *dest); -#endif +#endif /* !defined(CAMLIBS_ST2205_ST2205_H) */ diff --git a/camlibs/stv0674/library.h b/camlibs/stv0674/library.h index 64379e31a..325f4f7fe 100644 --- a/camlibs/stv0674/library.h +++ b/camlibs/stv0674/library.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef LIBRARY_H -#define LIBRARY_H +#ifndef CAMLIBS_STV0674_LIBRARY_H +#define CAMLIBS_STV0674_LIBRARY_H #include <gphoto2/gphoto2-port.h> @@ -34,4 +34,4 @@ int stv0674_capture_preview (GPPort *device, char **data, int *size); int stv0674_capture (GPPort *port); int stv0674_delete_all (GPPort *port); -#endif +#endif /* !defined(CAMLIBS_STV0674_LIBRARY_H) */ diff --git a/camlibs/stv0674/stv0674.h b/camlibs/stv0674/stv0674.h index 041510f47..ba58ca187 100644 --- a/camlibs/stv0674/stv0674.h +++ b/camlibs/stv0674/stv0674.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef STV0674_H -#define STV0674_H +#ifndef CAMLIBS_STV0674_STV0674_H +#define CAMLIBS_STV0674_STV0674_H #define CMDID_SET_IMAGE 0x3 #define CMDID_READ_IMAGE 0x5 @@ -34,4 +34,4 @@ #define CMDID_IHAVENOIDEA 0x86 -#endif +#endif /* !defined(CAMLIBS_STV0674_STV0674_H) */ diff --git a/camlibs/stv0680/bayer.h b/camlibs/stv0680/bayer.h index 9bf80d0da..fb7dd5601 100644 --- a/camlibs/stv0680/bayer.h +++ b/camlibs/stv0680/bayer.h @@ -18,13 +18,13 @@ * Boston, MA 02110-1301 USA */ -#ifndef BAYER_H -#define BAYER_H +#ifndef CAMLIBS_STV0680_BAYER_H +#define CAMLIBS_STV0680_BAYER_H void bayer_unshuffle_preview(unsigned int w, unsigned int h, unsigned int scale, unsigned char *raw, unsigned char *output); void light_enhance(unsigned int vw, unsigned int vh, unsigned int coarse, unsigned int fine, unsigned char avg_pix_val, unsigned char *output); -#endif +#endif /* !defined(CAMLIBS_STV0680_BAYER_H) */ diff --git a/camlibs/stv0680/demosaic_sharpen.h b/camlibs/stv0680/demosaic_sharpen.h index 3ca352525..653abea99 100644 --- a/camlibs/stv0680/demosaic_sharpen.h +++ b/camlibs/stv0680/demosaic_sharpen.h @@ -1,6 +1,7 @@ /** Decl of demosaic_sharpen */ -#ifndef __STV680_DEMOSAIC_SHARPEN_H -#define __STV680_DEMOSAIC_SHARPEN_H + +#ifndef CAMLIBS_STV0680_DEMOSAIC_SHARPEN_H +#define CAMLIBS_STV0680_DEMOSAIC_SHARPEN_H #ifndef __BAYER_H__ typedef enum _BayerTile{ @@ -19,4 +20,5 @@ void demosaic_sharpen (const int width, const int height, const unsigned char * const src_region, unsigned char * const dest_region, const int alpha, const BayerTile bt); -#endif + +#endif /* !defined(CAMLIBS_STV0680_DEMOSAIC_SHARPEN_H) */ diff --git a/camlibs/stv0680/library.h b/camlibs/stv0680/library.h index f997be87f..017a262cc 100644 --- a/camlibs/stv0680/library.h +++ b/camlibs/stv0680/library.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef LIBRARY_H -#define LIBRARY_H +#ifndef CAMLIBS_STV0680_LIBRARY_H +#define CAMLIBS_STV0680_LIBRARY_H #include <gphoto2/gphoto2-port.h> @@ -34,4 +34,4 @@ int stv0680_capture_preview (GPPort *device, char **data, int *size); int stv0680_capture (GPPort *port); int stv0680_delete_all (GPPort *port); -#endif +#endif /* !defined(CAMLIBS_STV0680_LIBRARY_H) */ diff --git a/camlibs/stv0680/saturate.h b/camlibs/stv0680/saturate.h index 5c2f2d7dc..710debc8a 100644 --- a/camlibs/stv0680/saturate.h +++ b/camlibs/stv0680/saturate.h @@ -1,5 +1,3 @@ -#ifndef _SATURATE_H -#define _SATURATE_H /* The GIMP -- an image manipulation program * Copyright 1995 Spencer Kimball and Peter Mattis * @@ -19,6 +17,9 @@ * Boston, MA 02110-1301 USA */ +#ifndef CAMLIBS_STV0680_SATURATE_H +#define CAMLIBS_STV0680_SATURATE_H + #define RED_PIX 0 #define GREEN_PIX 1 #define BLUE_PIX 2 @@ -64,4 +65,5 @@ struct _HueSaturationDialog }; extern void stv680_hue_saturation( int width, int height, unsigned char *srcPR, unsigned char *destPR); -#endif + +#endif /* !defined(CAMLIBS_STV0680_SATURATE_H) */ diff --git a/camlibs/stv0680/sharpen.h b/camlibs/stv0680/sharpen.h index a6837715a..82f14cac4 100644 --- a/camlibs/stv0680/sharpen.h +++ b/camlibs/stv0680/sharpen.h @@ -1,7 +1,9 @@ -#ifndef __STV680_SHARPEN_H -#define __STV680_SHARPEN_H +#ifndef CAMLIBS_STV0680_SHARPEN_H +#define CAMLIBS_STV0680_SHARPEN_H + void sharpen(int width, int height, unsigned char *src_region, unsigned char *dest_region, int sharpen_percent ); -#endif + +#endif /* !defined(CAMLIBS_STV0680_SHARPEN_H) */ diff --git a/camlibs/stv0680/stv0680.h b/camlibs/stv0680/stv0680.h index 251497cfc..9955a1a57 100644 --- a/camlibs/stv0680/stv0680.h +++ b/camlibs/stv0680/stv0680.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef STV0680_H -#define STV0680_H +#ifndef CAMLIBS_STV0680_STV0680_H +#define CAMLIBS_STV0680_STV0680_H #define CMDID_CLEAR_COMMS_ERROR 0x80 struct stv680_error_info { @@ -171,4 +171,4 @@ int stv0680_try_cmd(GPPort *port, unsigned char cmd, unsigned char *response, unsigned char response_len); -#endif +#endif /* !defined(CAMLIBS_STV0680_STV0680_H) */ diff --git a/camlibs/sx330z/sx330z.h b/camlibs/sx330z/sx330z.h index 93365b609..f5d4d7aee 100644 --- a/camlibs/sx330z/sx330z.h +++ b/camlibs/sx330z/sx330z.h @@ -22,6 +22,9 @@ * first try 6/2002 by Dominik Kuhlen <dkuhlen@fhm.edu> */ +#ifndef CAMLIBS_SX330Z_SX330Z_H +#define CAMLIBS_SX330Z_SX330Z_H + #include <gphoto2/gphoto2-camera.h> #include <gphoto2/gphoto2-context.h> @@ -135,3 +138,5 @@ int sx330z_delete_file(Camera *camera,GPContext *context,const char *filename); * Exit camera */ int camera_exit(Camera *camera, GPContext *context); + +#endif /* !defined(CAMLIBS_SX330Z_SX330Z_H) */ diff --git a/camlibs/topfield/crc16.h b/camlibs/topfield/crc16.h index f7904c316..6fc117c31 100644 --- a/camlibs/topfield/crc16.h +++ b/camlibs/topfield/crc16.h @@ -23,6 +23,11 @@ */ +#ifndef CAMLIBS_TOPFIELD_CRC16_H +#define CAMLIBS_TOPFIELD_CRC16_H + #include <sys/types.h> unsigned short crc16_ansi(const void *data, size_t size); + +#endif /* !defined(CAMLIBS_TOPFIELD_CRC16_H) */ diff --git a/camlibs/topfield/mjd.h b/camlibs/topfield/mjd.h index cfa9d029c..19bfccb7c 100644 --- a/camlibs/topfield/mjd.h +++ b/camlibs/topfield/mjd.h @@ -21,8 +21,8 @@ */ -#ifndef _MJD_H -#define _MJD_H 1 +#ifndef CAMLIBS_TOPFIELD_MJD_H +#define CAMLIBS_TOPFIELD_MJD_H #include <time.h> #include <sys/types.h> @@ -41,4 +41,4 @@ struct tf_datetime time_t tfdt_to_time(struct tf_datetime *dt); void time_to_tfdt(time_t t, struct tf_datetime *dt); -#endif /* _MJD_H */ +#endif /* !defined(CAMLIBS_TOPFIELD_MJD_H) */ diff --git a/camlibs/topfield/tf_bytes.h b/camlibs/topfield/tf_bytes.h index 26f128d63..f8aede3ef 100644 --- a/camlibs/topfield/tf_bytes.h +++ b/camlibs/topfield/tf_bytes.h @@ -21,8 +21,8 @@ */ -#ifndef _TF_BYTES_H -#define _TF_BYTES_H 1 +#ifndef CAMLIBS_TOPFIELD_TF_BYTES_H +#define CAMLIBS_TOPFIELD_TF_BYTES_H #include <stdint.h> @@ -36,4 +36,4 @@ void put_u16(void *addr, unsigned short val); void put_u32(void *addr, unsigned int val); void put_u64(void *addr, uint64_t val); -#endif /* _TF_BYTES_H */ +#endif /* !defined(CAMLIBS_TOPFIELD_TF_BYTES_H) */ diff --git a/camlibs/topfield/usb_io.h b/camlibs/topfield/usb_io.h index fda626d72..00b8e3ff8 100644 --- a/camlibs/topfield/usb_io.h +++ b/camlibs/topfield/usb_io.h @@ -24,8 +24,8 @@ */ -#ifndef _USB_IO_H -#define _USB_IO_H 1 +#ifndef CAMLIBS_TOPFIELD_USB_IO_H +#define CAMLIBS_TOPFIELD_USB_IO_H #include <gphoto2/gphoto2-camera.h> #include <sys/types.h> @@ -111,4 +111,4 @@ ssize_t send_cmd_hdd_create_dir(Camera *camera, char *path, GPContext *context); ssize_t get_tf_packet(Camera *camera, struct tf_packet *packet, GPContext *context); ssize_t send_tf_packet(Camera *camera, struct tf_packet *packet, GPContext *context); -#endif /* _USB_IO_H */ +#endif /* !defined(CAMLIBS_TOPFIELD_USB_IO_H) */ diff --git a/camlibs/toshiba/pdrm11/pdrm11.h b/camlibs/toshiba/pdrm11/pdrm11.h index aa8105d8c..5343ef6eb 100644 --- a/camlibs/toshiba/pdrm11/pdrm11.h +++ b/camlibs/toshiba/pdrm11/pdrm11.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __PDRM11_H__ -#define __PDRM11_H__ +#ifndef CAMLIBS_TOSHIBA_PDRM11_PDRM11_H +#define CAMLIBS_TOSHIBA_PDRM11_PDRM11_H #include "config.h" #include <gphoto2/gphoto2.h> @@ -83,4 +83,4 @@ int pdrm11_delete_file(GPPort *port, int picNum); -#endif /* __PDRM11_H__ */ +#endif /* !defined(CAMLIBS_TOSHIBA_PDRM11_PDRM11_H) */ diff --git a/camlibs/tp6801/tp6801.h b/camlibs/tp6801/tp6801.h index 5a47b4146..4d8d0b12e 100644 --- a/camlibs/tp6801/tp6801.h +++ b/camlibs/tp6801/tp6801.h @@ -17,8 +17,10 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ -#ifndef __TP6801_H__ -#define __TP6801_H__ + +#ifndef CAMLIBS_TP6801_TP6801_H +#define CAMLIBS_TP6801_TP6801_H + #include "config.h" #include <stdio.h> @@ -126,4 +128,4 @@ tp6801_set_time_and_date(Camera *camera, struct tm *t); int tp6801_filesize(Camera *camera); -#endif +#endif /* !defined(CAMLIBS_TP6801_TP6801_H) */ |