summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/sup/src/c.h10
-rw-r--r--usr.bin/sup/src/sup.h18
-rw-r--r--usr.bin/sup/src/supmsg.h10
3 files changed, 19 insertions, 19 deletions
diff --git a/usr.bin/sup/src/c.h b/usr.bin/sup/src/c.h
index 01e80ecb9f7..07ce8eb05b4 100644
--- a/usr.bin/sup/src/c.h
+++ b/usr.bin/sup/src/c.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: c.h,v 1.2 1996/06/26 05:39:38 deraadt Exp $ */
+/* $OpenBSD: c.h,v 1.3 2001/04/29 18:14:09 millert Exp $ */
/*
* Copyright (c) 1991 Carnegie Mellon University
@@ -62,20 +62,20 @@
#ifndef FALSE
#define FALSE 0
-#endif FALSE
+#endif
#ifndef TRUE
#define TRUE 1
-#endif TRUE
+#endif
#define CERROR (-1)
#ifndef bool
typedef enum { false = 0, true = 1 } bool;
-#endif bool
+#endif
#define sizeofS(string) (sizeof(string) - 1)
#define sizeofA(array) (sizeof(array)/sizeof(array[0]))
#define caseE(enum_type) case (int)(enum_type)
-#endif _C_INCLUDE_
+#endif /* _C_INCLUDE_ */
diff --git a/usr.bin/sup/src/sup.h b/usr.bin/sup/src/sup.h
index 33e26e7a531..ed369eb3e78 100644
--- a/usr.bin/sup/src/sup.h
+++ b/usr.bin/sup/src/sup.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sup.h,v 1.4 1997/07/28 09:47:36 deraadt Exp $ */
+/* $OpenBSD: sup.h,v 1.5 2001/04/29 18:14:09 millert Exp $ */
/*
* Copyright (c) 1992 Carnegie Mellon University
@@ -107,11 +107,11 @@ extern char scmversion[]; /* string version of scm */
#define FILESUPDEFAULT "%s/supfiles/coll.list"
#define FILESUPTDEFAULT "%s/supfiles/coll.what"
#define FILEHOSTS "%s/supfiles/coll.host"
-#else EE_XXX
+#else /* EE_XXX */
#define FILESUPDEFAULT "%s/lib/supfiles/coll.list"
#define FILESUPTDEFAULT "%s/lib/supfiles/coll.what"
#define FILEHOSTS "%s/lib/supfiles/coll.host"
-#endif EE_XXX
+#endif /* EE_XXX */
#define FILEBKDIR "%s/BACKUP"
#define FILEBACKUP "%s/BACKUP/%s"
#define FILELAST "sup/%s/last%s"
@@ -124,9 +124,9 @@ extern char scmversion[]; /* string version of scm */
#define FILEXPATCH "%s/sup/xpatch.host"
#ifdef EE_XXX
#define FILEDIRS "%s/supfiles/coll.dir" /* also supscan */
-#else EE_XXX
+#else /* EE_XXX */
#define FILEDIRS "%s/lib/supfiles/coll.dir" /* also supscan */
-#endif EE_XXX
+#endif /* EE_XXX */
#define FILECRYPT "sup/%s/crypt"
#define FILELOGFILE "sup/%s/logfile"
#define FILEPREFIX "sup/%s/prefix" /* also supscan */
@@ -144,15 +144,15 @@ extern char scmversion[]; /* string version of scm */
#ifndef DEFDIR
#ifdef EE_XXX
#define DEFDIR "/etc"
-#else EE_XXX
+#else /* EE_XXX */
#define DEFDIR "/usr"
-#endif EE_XXX
-#endif DEFDIR
+#endif /* EE_XXX */
+#endif /* DEFDIR */
/* Default login account for file server */
#ifndef DEFUSER
#define DEFUSER "anon"
-#endif DEFUSER
+#endif /* DEFUSER */
/* subroutine return codes */
#define SCMOK (1) /* routine performed correctly */
diff --git a/usr.bin/sup/src/supmsg.h b/usr.bin/sup/src/supmsg.h
index a1c07d99c0f..2056e841a5d 100644
--- a/usr.bin/sup/src/supmsg.h
+++ b/usr.bin/sup/src/supmsg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: supmsg.h,v 1.4 1997/04/01 07:35:47 todd Exp $ */
+/* $OpenBSD: supmsg.h,v 1.5 2001/04/29 18:14:09 millert Exp $ */
/*
* Copyright (c) 1992 Carnegie Mellon University
@@ -104,13 +104,13 @@
extern int server; /* true if we are the server */
extern int protver; /* protocol version of partner */
-#else MSGSUBR
+#else /* MSGSUBR */
#ifdef MSGFILE
#define EXTERN
-#else MSGFILE
+#else /* MSGFILE */
#define EXTERN extern
-#endif MSGFILE
+#endif /* MSGFILE */
/* used in all msg routines */
EXTERN int server; /* true if we are the server */
@@ -175,4 +175,4 @@ EXTERN char *donereason; /* set if indicated by doneack */
#undef EXTERN
-#endif MSGSUBR
+#endif /* MSGSUBR */