Patch: inn-CURRENT-20061121/include/inn header guard clean-ups
Adam J. Richter
adam at yggdrasil.com
Wed Nov 22 04:52:19 UTC 2006
[This is a resend because isc.org apparently bounced my message on
the basis of my computer's dynamic IP being on some black list. --Adam]
Hi Russ,
include/inn/inndcomm.h did not have a header guard, and a
couple of others used guard symbols beginning with underscores.
Here is the patch.
I have verified that on my system "./configure --prefix=/usr
&& make all && make install" succeeds, and that all of the .o files
generated with the patch are the same without this patch, at least
when the .o files are stripped.
Adam
-----------------------------------------------------------------------
diff -u -r inn-CURRENT-20061121/include/inn/inndcomm.h inn-CURRENT/include/inn/inndcomm.h
--- inn-CURRENT-20061121/include/inn/inndcomm.h 2006-11-21 18:04:08.000000000 +0800
+++ inn-CURRENT/include/inn/inndcomm.h 2006-11-22 05:05:51.000000000 +0800
@@ -4,6 +4,9 @@
** running.
*/
+#ifndef INN_INNDCOMM_H
+#define INN_INNDCOMM_H
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@@ -89,3 +92,4 @@
#ifdef __cplusplus
}
#endif /* __cplusplus */
+#endif /* !INN_INNDCOMM_H */
diff -u -r inn-CURRENT-20061121/include/inn/ov.h inn-CURRENT/include/inn/ov.h
--- inn-CURRENT-20061121/include/inn/ov.h 2006-11-21 18:04:08.000000000 +0800
+++ inn-CURRENT/include/inn/ov.h 2006-11-22 05:05:43.000000000 +0800
@@ -1,5 +1,5 @@
-#ifndef _OV_H_
-#define _OV_H_
+#ifndef INN_OV_H
+#define INN_OV_H
#include "storage.h"
#include "inn/history.h"
@@ -79,4 +79,4 @@
}
#endif /* __cplusplus */
-#endif /* _OV_H_ */
+#endif /* !INN_OV_H */
diff -u -r inn-CURRENT-20061121/include/inn/storage.h inn-CURRENT/include/inn/storage.h
--- inn-CURRENT-20061121/include/inn/storage.h 2006-11-21 18:04:08.000000000 +0800
+++ inn-CURRENT/include/inn/storage.h 2006-11-22 05:05:28.000000000 +0800
@@ -3,8 +3,8 @@
** Here be declarations related to the storage subsystem.
*/
-#ifndef __STORAGE_H__
-#define __STORAGE_H__
+#ifndef INN_STORAGE_H
+#define INN_STORAGE_H
#include <stdio.h>
#include <sys/types.h>
@@ -87,4 +87,4 @@
END_DECLS
-#endif
+#endif /* !INN_STORAGE_H */
More information about the inn-workers
mailing list