second code style cleanup: void/void * usage, proper #includes. try to

[moira.git] / clients / moira / defs.h

diff --git a/clients/moira/defs.h b/clients/moira/defs.h
index f7cd9766af677f1a3919738ce340f1e4254ecd0d..062c44be134e3caa5af404d9e1a3ded6b8251a02 100644 (file)
--- a/clients/moira/defs.h
+++ b/clients/moira/defs.h
@@ -1,21 +1,18 @@
-/*     This is the file defs.h for the Moira Client, which allows users
+/* $Id $
+ *
+ *     This is the file defs.h for the Moira Client, which allows users
  *      to quickly and easily maintain most parts of the Moira database.
  *     It Contains: useful definitions.
  *
  *     Created:        4/12/88
  *     By:             Chris D. Peterson
  *
- *      $Source$
- *      $Author$
- *      $Header$
- *
- *     Copyright 1988 by the Massachusetts Institute of Technology.
- *
- *     For further information on copyright and distribution
- *     see the file mit-copyright.h
+ * Copyright (C) 1988-1998 by the Massachusetts Institute of Technology.
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
  */
 
-#include "mit-copyright.h"
+#include <mit-copyright.h>
 
 #ifndef _defs_header_
 #define _defs_header_
@@ -45,10 +42,6 @@
 
 #define MAX_ARGS_SIZE 100
 
-typedef void (*FVoid)();       /* function pointer typedef. */
-typedef char *(*FCharStar)();  /* function pointer typedef. */
-typedef int (*FInt)();         /* function pointer typedef. */
-
 typedef int Bool;
 
 #define IS_EMPTY(s)  (strlen((s)) == 0)
@@ -64,7 +57,7 @@ typedef int Bool;
 struct qelem {
   struct qelem *q_forw;
   struct qelem *q_back;
-  char *q_data;
+  void *q_data;
 };
 
 #endif /* _defs_header_ */     /* Do Not Add Anything After This Line */