From 0dbeaf7cbf30ab88ac7aea3e7d3f24df8dc0309f Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 5 Oct 2021 15:50:32 +0200 Subject: 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. --- examples/samples.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/samples.h b/examples/samples.h index 391be513c..03d40b31f 100644 --- a/examples/samples.h +++ b/examples/samples.h @@ -1,5 +1,6 @@ -#ifndef __SAMPLES_H -#define __SAMPLES_H +#ifndef LIBGPHOTO2_SAMPLES_H +#define LIBGPHOTO2_SAMPLES_H + #include #ifdef __cplusplus @@ -27,4 +28,4 @@ extern int camera_manual_focus (Camera *list, int tgt, GPContext *context); }; #endif -#endif +#endif /* !defined(LIBGPHOTO2_SAMPLES_H) */ -- cgit v1.2.1