Don't conditionalize prototypes; delete macros supporting it. (Maybe overdone;

don't worry about restoring them when importing new versions of code.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13792 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 22 insertions, 31 deletions

diff --git a/src/util/dyn/ChangeLog b/src/util/dyn/ChangeLog
index f6f22c9f7..1ced11574 100644
--- a/src/util/dyn/ChangeLog
+++ b/src/util/dyn/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* dyn.h, dynP.h: Make prototypes unconditional.  Don't define
+	P().
+
 2001-04-25  Ezra Peisach  <epeisach@mit.edu>
 
 	* test.c: Always include stdlib.h
diff --git a/src/util/dyn/dyn.h b/src/util/dyn/dyn.h
index 267d758dd..86cd0b205 100644
--- a/src/util/dyn/dyn.h
+++ b/src/util/dyn/dyn.h
@@ -36,28 +36,21 @@ typedef struct _DynObject {
 #define DYN_BADINDEX	-1002
 #define DYN_BADVALUE	-1003
      
-/* Function declarations */
-#if defined(__STDC__) || defined(__LCLINT__)
-#define P(args) args
-#else
-#define P(args) ()
-#endif /* __STDC__ */
-
-/*@null@*//*@only@*/ DynObject DynCreate P((int el_size, int inc));
-/*@null@*//*@only@*/ DynObject DynCopy P((DynObject obj));
-int DynDestroy P((/*@only@*/DynObject obj)), DynRelease P((DynObject obj));
-int DynAdd P((DynObject obj, void *el));
-int DynPut P((DynObject obj, void *el, int idx));
-int DynInsert P((DynObject obj, int idx, /*@observer@*/void *els, int num));
-int DynDelete P((DynObject obj, int idx));
-/*@dependent@*//*@null@*/ DynPtr DynGet P((DynObject obj, int num));
-/*@observer@*/ DynPtr DynArray P((DynObject obj));
-int DynDebug P((DynObject obj, int state));
-int DynParanoid P((DynObject obj, int state));
-int DynInitzero P((DynObject obj, int state));
-int DynSize P((DynObject obj));
-int DynCapacity P((DynObject obj));
-int DynAppend P((DynObject obj, DynPtr els, int num));
+/*@null@*//*@only@*/ DynObject DynCreate (int el_size, int inc);
+/*@null@*//*@only@*/ DynObject DynCopy (DynObject obj);
+int DynDestroy (/*@only@*/DynObject obj), DynRelease (DynObject obj);
+int DynAdd (DynObject obj, void *el);
+int DynPut (DynObject obj, void *el, int idx);
+int DynInsert (DynObject obj, int idx, /*@observer@*/void *els, int num);
+int DynDelete (DynObject obj, int idx);
+/*@dependent@*//*@null@*/ DynPtr DynGet (DynObject obj, int num);
+/*@observer@*/ DynPtr DynArray (DynObject obj);
+int DynDebug (DynObject obj, int state);
+int DynParanoid (DynObject obj, int state);
+int DynInitzero (DynObject obj, int state);
+int DynSize (DynObject obj);
+int DynCapacity (DynObject obj);
+int DynAppend (DynObject obj, DynPtr els, int num);
 
 #undef P
 
diff --git a/src/util/dyn/dynP.h b/src/util/dyn/dynP.h
index 6cc6e5867..bd86637bb 100644
--- a/src/util/dyn/dynP.h
+++ b/src/util/dyn/dynP.h
@@ -37,16 +37,9 @@
 
 typedef struct _DynObject DynObjectRecP, *DynObjectP;
 
-/* Function declarations */
-#ifdef __STDC__
-#define P(args) args
-#else
-#define P(args) ()
-#endif /* __STDC__ */
-
 /* Internal functions */
-int _DynRealloc P((DynObjectP obj, int req)), 
-  _DynResize P((DynObjectP obj, int req));
+int _DynRealloc (DynObjectP obj, int req), 
+  _DynResize (DynObjectP obj, int req);
 
 #undef P