Bad naming. The correct protection is visible in others in the same directory, most of them doing it better.
audio_if.h:#ifndef _SYS_DEV_AUDIO_IF_H_ ipmi.h:#ifndef _IPMI_H_ ipmivar.h:#ifndef _IPMIVAR_H_ midi_if.h:#ifndef _SYS_DEV_MIDI_IF_H_ midivar.h:#ifndef _SYS_DEV_MIDIVAR_H_ radio_if.h:#ifndef _SYS_DEV_RADIO_IF_H radiovar.h:#ifndef _SYS_DEV_RADIOVAR_H rndis.h:#ifndef _DEV_RNDIS_H_ softraidvar.h:#ifndef SOFTRAIDVAR_H video_if.h:#ifndef _SYS_DEV_VIDEO_IF_H vndioctl.h:#ifndef _SYS_VNDIOCTL_H_ vscsivar.h:#ifndef _SYS_DEV_VSCSIVAR_H So at minimum, the leading _, but the directory name and _H_ at end is also common. Klemens Nanni <k...@openbsd.org> wrote: > > > Building installboot(8) with multiple <dev/biovar.h> includes fails > without this. > > OK? > > > Index: dev/biovar.h > =================================================================== > RCS file: /cvs/src/sys/dev/biovar.h,v > retrieving revision 1.45 > diff -u -p -r1.45 biovar.h > --- dev/biovar.h 14 Aug 2016 04:08:03 -0000 1.45 > +++ dev/biovar.h 7 Jun 2020 11:55:15 -0000 > @@ -26,6 +26,9 @@ > * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > > +#ifndef BIOVAR_H > +#define BIOVAR_H > + > /* > * Devices getting ioctls through this interface should use ioctl class 'B' > * and command numbers starting from 32, lower ones are reserved for generic > @@ -305,3 +308,5 @@ void bio_info(struct bio_status *, int, > void bio_warn(struct bio_status *, int, const char *, ...); > void bio_error(struct bio_status *, int, const char *, ...); > #endif > + > +#endif /* BIOVAR_H */ >
