From 694d9b08c6dc57398a13df47f6fb800779e811e0 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 12 Feb 2021 01:42:07 +0700 Subject: [PATCH] Update more header include guards. (#348) Some of these didn't have include guards, some used old names for them. Now they follow the current convention. --- inc/XKeymap.h | 5 +++++ inc/devif.h | 8 +++----- inc/display.h | 5 +++++ inc/ifpage.h | 4 ++-- inc/inlineC.h | 5 +++++ inc/iopage.h | 4 ++-- inc/keysym.h | 5 +++++ inc/ldeXdefs.h | 7 ++++--- inc/lispmap.h | 5 +++++ inc/lpkit.h | 11 ++++------- inc/lspglob.h | 5 +++++ inc/rs232c.h | 5 +++++ inc/subrs.h | 5 +++++ inc/tosfns.h | 5 +++++ 14 files changed, 60 insertions(+), 19 deletions(-) diff --git a/inc/XKeymap.h b/inc/XKeymap.h index 85e1cf9..f349920 100644 --- a/inc/XKeymap.h +++ b/inc/XKeymap.h @@ -1,3 +1,6 @@ +#ifndef XKEYMAP_H +#define XKEYMAP_H 1 + /* $Id: XKeymap.h,v 1.2 1999/01/03 02:05:48 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ @@ -252,3 +255,5 @@ int generic_X_keymap[] = { -1, -1, -1}; #endif /* XWINDOW */ + +#endif diff --git a/inc/devif.h b/inc/devif.h index 48c63fd..a10c37f 100644 --- a/inc/devif.h +++ b/inc/devif.h @@ -1,3 +1,5 @@ +#ifndef DEVIF_H +#define DEVIF_H 1 /* $Id: devif.h,v 1.2 1999/01/03 02:05:57 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ @@ -10,10 +12,6 @@ /* */ /************************************************************************/ -#ifndef __DEVIF__ -#define __DEVIF__ 1 - - typedef void (*PFV)(); /* Pointer to Function returning Void */ typedef int (*PFI)(); /* Pointer to Function returning Int */ typedef char (*PFC)(); /* Pointer to Function returning Char */ @@ -300,5 +298,5 @@ typedef struct #define MINKEYEVENT 2 /* leave 2 words for read,write offsets */ #define NUMBEROFKEYEVENTS 383 -#endif /* __DEVIF__ */ +#endif diff --git a/inc/display.h b/inc/display.h index ba7f8d6..03453ea 100755 --- a/inc/display.h +++ b/inc/display.h @@ -1,3 +1,6 @@ +#ifndef DISPLAY_H +#define DISPLAY_H 1 + /* $Id: display.h,v 1.2 1999/01/03 02:05:57 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ @@ -82,3 +85,5 @@ void flush_display_ptrregion(DLword *ybase, UNSIGNED bitoffset, UNSIGNED w, UNSI #ifdef BYTESWAP void byte_swapped_displayregion(int x, int y, int w, int h); #endif + +#endif diff --git a/inc/ifpage.h b/inc/ifpage.h index b3c077f..e40b748 100755 --- a/inc/ifpage.h +++ b/inc/ifpage.h @@ -1,3 +1,5 @@ +#ifndef IFPAGE_H +#define IFPAGE_H 1 /* $Id: ifpage.h,v 1.2 1999/01/03 02:06:01 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ @@ -12,8 +14,6 @@ /* */ /************************************************************************/ -#ifndef IFPAGE_DEFINED -#define IFPAGE_DEFINED (1) #define IFPAGE_KEYVAL 0x15e3 #ifndef BYTESWAP #ifdef BIGVM diff --git a/inc/inlineC.h b/inc/inlineC.h index cf47bef..eeb9759 100644 --- a/inc/inlineC.h +++ b/inc/inlineC.h @@ -1,3 +1,6 @@ +#ifndef INLINEC_H +#define INLINEC_H 1 + /* $Id: inlineC.h,v 1.3 1999/01/03 02:06:02 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ @@ -1181,3 +1184,5 @@ CSTKPTRL -= 8; \ nextop1; \ } while (0) + +#endif diff --git a/inc/iopage.h b/inc/iopage.h index 5b96967..655747d 100755 --- a/inc/iopage.h +++ b/inc/iopage.h @@ -1,3 +1,5 @@ +#ifndef IOPAGE_H +#define IOPAGE_H 1 /* $Id: iopage.h,v 1.2 1999/01/03 02:06:06 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ @@ -9,8 +11,6 @@ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ -#ifndef IOPAGE_DEFINED -#define IOPAGE_DEFINED (1) #ifndef BYTESWAP /* Normal definition, for big-endian machines */ typedef struct iopage { diff --git a/inc/keysym.h b/inc/keysym.h index ae7fd2d..13115f7 100755 --- a/inc/keysym.h +++ b/inc/keysym.h @@ -1,3 +1,6 @@ +#ifndef KEYSYM_H +#define KEYSYM_H 1 + /* $Id: keysym.h,v 1.2 1999/01/03 02:06:07 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ @@ -126,3 +129,5 @@ #define KEY_PROPS 109 #define KEY_PRSC 110 #define KEY_OPEN 111 + +#endif diff --git a/inc/ldeXdefs.h b/inc/ldeXdefs.h index 8597cb1..ce08ebb 100755 --- a/inc/ldeXdefs.h +++ b/inc/ldeXdefs.h @@ -1,3 +1,6 @@ +#ifndef LDEXDEFS_H +#define LDEXDEFS_H 1 + /* $Id: ldeXdefs.h,v 1.2 1999/01/03 02:06:07 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ /* * * * * X defs for all files in Medley * * * * */ @@ -12,9 +15,6 @@ /************************************************************************/ -#ifndef __LDEXDEF__ - -#define __LDEXDEF__ 1 #include #ifdef LOCK_X_UPDATES #define XLOCK { XLocked++; /* printf("L"); fflush(stdout);*/} @@ -34,5 +34,6 @@ extern int XLocked; extern int XNeedSignal; /* this is !0 if we're locked; it should be 0 or larger always */ + #endif diff --git a/inc/lispmap.h b/inc/lispmap.h index 63c2c59..b7d19d2 100755 --- a/inc/lispmap.h +++ b/inc/lispmap.h @@ -1,3 +1,6 @@ +#ifndef LISPMAP_H +#define LISPMAP_H 1 + /* $Id: lispmap.h,v 1.3 1999/01/03 02:06:08 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ @@ -381,3 +384,5 @@ #define D_PNHI 010 #define D_DEFSHI 012 #define D_VALSHI 014 + +#endif diff --git a/inc/lpkit.h b/inc/lpkit.h index d2b5ae8..5d5af1b 100755 --- a/inc/lpkit.h +++ b/inc/lpkit.h @@ -1,3 +1,6 @@ +#ifndef LPKIT_H +#define LPKIT_H 1 + /* $Id: lpkit.h,v 1.2 1999/01/03 02:06:14 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ /* @@ -528,10 +531,4 @@ void invert(void); extern jmp_buf LP_jmpbuf; extern int SolveCount; - - - - - - - +#endif diff --git a/inc/lspglob.h b/inc/lspglob.h index 4eebed5..df38ea7 100755 --- a/inc/lspglob.h +++ b/inc/lspglob.h @@ -1,3 +1,6 @@ +#ifndef LSPGLOB_H +#define LSPGLOB_H 1 + /* $Id: lspglob.h,v 1.2 1999/01/03 02:06:15 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ @@ -168,3 +171,5 @@ extern int UnixPID; /* Atom index for IL:\MVLIST, for the VALUES opcode */ extern LispPTR MVLIST_index; + +#endif diff --git a/inc/rs232c.h b/inc/rs232c.h index bf2bbd4..69af9fc 100755 --- a/inc/rs232c.h +++ b/inc/rs232c.h @@ -1,3 +1,6 @@ +#ifndef RS232C_H +#define RS232C_H 1 + /* $Id: rs232c.h,v 1.2 1999/01/03 02:06:22 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ @@ -165,3 +168,5 @@ typedef struct { } RS232C_ENCAPSULATION; extern DLword *Lisp_world; + +#endif diff --git a/inc/subrs.h b/inc/subrs.h index 4f2565a..18bd61a 100755 --- a/inc/subrs.h +++ b/inc/subrs.h @@ -1,3 +1,6 @@ +#ifndef SUBRS_H +#define SUBRS_H 1 + /* $Id: subrs.h,v 1.2 1999/01/03 02:06:24 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ /* Do not edit this file! Instead, edit the list \initsubrs */ @@ -187,3 +190,5 @@ /* Assigned USER SUBR numbers */ #define user_subr_DUMMY 012 #define user_subr_SAMPLE_USER_SUBR 00 + +#endif diff --git a/inc/tosfns.h b/inc/tosfns.h index 5d871ff..636212c 100644 --- a/inc/tosfns.h +++ b/inc/tosfns.h @@ -1,3 +1,6 @@ +#ifndef TOSFNS_H +#define TOSFNS_H 1 + /* $Id: tosfns.h,v 1.2 1999/01/03 02:06:28 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ @@ -618,3 +621,5 @@ } /* end switch */ \ } while (0) /* EVAL end */ #endif + +#endif