Move RCSID and USE_VAR definitions out to defs.h.

diff --git a/src/compat.c b/src/compat.c
index e3cd1ce886501f84b0d12aa9f61f6d58524470e9..035387448181caf1287bd72cec691e530b40008b 100644 (file)
--- a/src/compat.c
+++ b/src/compat.c
@@ -34,7 +34,7 @@
 #endif
 
 #include "compat.h"
-#include "opm.h"
+#include "defs.h"
 
 RCSID("$Id$");
 

diff --git a/src/config.c b/src/config.c
index 69001acb5991a876ea4d36d4d408607baf0f71ed..49778c0949f4d7424ef74c14d09671359d32e037 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -1,5 +1,7 @@
+/* vim: set shiftwidth=3 softtabstop=3 expandtab: */
+
 /*
- * Copyright (C) 2002  Erik Fears
+ * Copyright (C) 2002-2003  Erik Fears
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -30,6 +32,7 @@
 #include "opm_types.h"
 #include "opm_common.h"
 #include "list.h"
+#include "defs.h"
 
 #ifdef STDC_HEADERS
 # include <string.h>

diff --git a/src/defs.h b/src/defs.h
new file mode 100644 (file)
index 0000000..df7a4f0
--- /dev/null
+++ b/src/defs.h
@@ -0,0 +1,13 @@
+/* vim: set shiftwidth=3 softtabstop=3 expandtab: */ 
+
+#ifndef DEFS_H
+#define DEFS_H
+
+/* Miscellaneous defines that don't belong anywhere else. */
+
+/* Stuff to shut up warnings about rcsid being unused. */
+#define USE_VAR(var)    static char sizeof##var = sizeof(sizeof##var) + sizeof(var)
+/* RCS tag. */
+#define RCSID(x)        static char rcsid[] = x; USE_VAR(rcsid);
+
+#endif /* DEFS_H */

diff --git a/src/inet.c b/src/inet.c
index d4b69cc689c602331d246cc59f9472241fc5ec3c..f4c048381b096a88adea80a76bacfa8a3531ec84 100644 (file)
--- a/src/inet.c
+++ b/src/inet.c
@@ -1,3 +1,5 @@
+/* vim: set shiftwidth=3 softtabstop=3 expandtab: */
+
 /*
 Copyright (C) 2002 by the past and present ircd coders, and others.
 
@@ -44,6 +46,7 @@ along with this program; if not, write to
 
 #include "inet.h"
 #include "opm.h"
+#include "defs.h"
 
 #ifndef INADDRSZ
 #define INADDRSZ 4

diff --git a/src/libopm.c b/src/libopm.c
index ef21ae03921075ec5f2c4570f5dbca05d375d2e5..5c75ad9821a240c5c280b578bbcbbd17459d37e1 100644 (file)
--- a/src/libopm.c
+++ b/src/libopm.c
@@ -1,3 +1,5 @@
+/* vim: set shiftwidth=3 softtabstop=3 expandtab: */
+
 /*
  * Copyright (C) 2002-2003  Erik Fears
  *
@@ -32,6 +34,7 @@
 #include "list.h"
 #include "inet.h"
 #include "proxy.h"
+#include "defs.h"
 
 #include <errno.h>
 #ifdef TIME_WITH_SYS_TIME

diff --git a/src/list.c b/src/list.c
index c25f6c09dc20824eb757dbe652b31ad894b8f055..22c44beaf8cd342316e8b4b3e74ffff1541dda07 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -1,3 +1,5 @@
+/* vim: set shiftwidth=3 softtabstop=3 expandtab: */
+
 /*
  * Copyright (C) 2002-2003  Erik Fears
  *
@@ -27,6 +29,7 @@
 #include "list.h"
 #include "malloc.h"
 #include "opm.h"
+#include "defs.h"
 
 RCSID("$Id$");
 

diff --git a/src/malloc.c b/src/malloc.c
index 17d2e010f93415d7246d29d812f3e074711e543f..53b8b1b7748a0bcaf7926fcf58abd3c79ecc3a33 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -1,5 +1,7 @@
+/* vim: set shiftwidth=3 softtabstop=3 expandtab: */
+
 /*
- * Copyright (C) 2002  Erik Fears
+ * Copyright (C) 2002-2003  Erik Fears
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,6 +28,7 @@
 
 #include "malloc.h"
 #include "opm.h"
+#include "defs.h"
 
 RCSID("$Id$");
 

diff --git a/src/opm.h b/src/opm.h
index f28350c79485542f513720d2d909ff4854c8185f..a4f993c2af05846e86d183b522e1f7753586fbca 100644 (file)
--- a/src/opm.h
+++ b/src/opm.h
@@ -11,12 +11,6 @@
 
 #include "opm_common.h"
 
-/* Stuff to shut up warnings about rcsid being unused. */
-#define USE_VAR(var)    static char sizeof##var = sizeof(sizeof##var) + sizeof(var)
-/* RCS tag. */
-#define RCSID(x)        static char rcsid[] = x; USE_VAR(rcsid);
-
-
 typedef struct  _OPM_CONFIG           OPM_CONFIG_T;
 typedef struct  _OPM                  OPM_T;
 typedef struct  _OPM_REMOTE           OPM_REMOTE_T;

diff --git a/src/proxy.c b/src/proxy.c
index 2372ad9b1f6c54546b032606138566e4a7c17bbc..e5edec0db5428b21ce5bf89c1345b60eb252f536 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1,6 +1,6 @@
 /* vim: set shiftwidth=3 softtabstop=3 expandtab: */
 
-/* Copyright (C) 2002  Erik Fears
+/* Copyright (C) 2002-2003  Erik Fears
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -39,6 +39,7 @@
 #include "opm_types.h"
 #include "opm_error.h"
 #include "libopm.h"
+#include "defs.h"
 
 RCSID("$Id$");
 

diff --git a/src/test.c b/src/test.c
index 81e7ca78b8f30f63ea4f89d22a59ed2209b52885..22be52a21ad9ad2acf598ce0456798065654dc30 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -23,14 +23,17 @@
 
 #include "setup.h"
 
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 #include <stdio.h>
+
 #include "opm.h"
 #include "opm_error.h"
 #include "opm_types.h"
 #include "compat.h"
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include "defs.h"
 
 RCSID("$Id$");