summaryrefslogtreecommitdiff
path: root/camlibs/canon/canon.h
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2021-10-05 15:50:32 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2021-10-05 16:07:20 +0200
commit0dbeaf7cbf30ab88ac7aea3e7d3f24df8dc0309f (patch)
tree5473eb1125e904a86e479180689167280a2e81dc /camlibs/canon/canon.h
parentbacd4128617e1dd613998c0268ded8304cef6f19 (diff)
downloadlibgphoto2-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/canon/canon.h')
-rw-r--r--camlibs/canon/canon.h6
1 files changed, 3 insertions, 3 deletions
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: