Fix Tru64 compile issues [Burkhard Schmidt]

diff --git a/NEWS b/NEWS
index 0b4f973feae3e9f4603cb661fa73c3b534e7c5f3..bf8c4bf7e58135986556f68e52c718517983521c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Changes in 1.6.4
 * FIX: Don't overwrite PAM file if --enable-overwrite configure option is
        not set. [Sam Noble]
 * FIX: afpd: Catsearch, fix possible SIGSEGV
+* FIX: cnid: Fix compile problems on Tru64. [Burkhard Schmidt]
 
 Changes in 1.6.3
 ================

diff --git a/libatalk/cnid/cnid_add.c b/libatalk/cnid/cnid_add.c
index ef590f8872a5644a301997db2cbf07699188b509..7e01fe8c15391e0c3f741fff2ade7c25a3f0a55a 100644 (file)
--- a/libatalk/cnid/cnid_add.c
+++ b/libatalk/cnid/cnid_add.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_add.c,v 1.30.2.3 2003-03-19 11:50:17 didg Exp $
+ * $Id: cnid_add.c,v 1.30.2.4 2003-09-16 14:21:44 bfernhomberg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -40,7 +40,7 @@
 #include "cnid_private.h"
 
 #ifdef CNID_DB_CDB
-    #define tid    NULL
+#define tid    NULL
 #endif /* CNID_DB_CDB */
 
 /* add an entry to the CNID databases. we do this as a transaction

diff --git a/libatalk/cnid/cnid_delete.c b/libatalk/cnid/cnid_delete.c
index 1b0d36d9f8dd6f15c70c0c3dee1038cb12dd4859..f32f8c01382072165088eeff3019a4e865336474 100644 (file)
--- a/libatalk/cnid/cnid_delete.c
+++ b/libatalk/cnid/cnid_delete.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_delete.c,v 1.14 2002-08-30 03:12:52 jmarcus Exp $
+ * $Id: cnid_delete.c,v 1.14.2.1 2003-09-16 14:21:44 bfernhomberg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -25,7 +25,7 @@
 #include "cnid_private.h"
 
 #ifdef CNID_DB_CDB
-    #define tid    NULL
+#define tid    NULL
 #endif /* CNID_DB_CDB */
 
 int cnid_delete(void *CNID, const cnid_t id) {

diff --git a/libatalk/cnid/cnid_mangle_add.c b/libatalk/cnid/cnid_mangle_add.c
index ac91abdf79ca489c9f99245ac89438c1c481f478..aebaf8257a17d87896793560ce9cd52caa72b640 100644 (file)
--- a/libatalk/cnid/cnid_mangle_add.c
+++ b/libatalk/cnid/cnid_mangle_add.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_mangle_add.c,v 1.4.2.1 2003-02-08 03:16:53 jmarcus Exp $
+ * $Id: cnid_mangle_add.c,v 1.4.2.2 2003-09-16 14:21:44 bfernhomberg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -23,7 +23,7 @@
 #include "cnid_private.h"
 
 #ifdef CNID_DB_CDB
-    #define tid    NULL
+#define tid    NULL
 #endif /* CNID_DB_CDB */
 
 /* Add a mangled filename. */

diff --git a/libatalk/cnid/cnid_update.c b/libatalk/cnid/cnid_update.c
index 1a2dbb1c5d6f8f808d92f58784bbf94040ebe99f..95cd6a66ef9fb2a3f5033b0c1b821457d0e336ec 100644 (file)
--- a/libatalk/cnid/cnid_update.c
+++ b/libatalk/cnid/cnid_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_update.c,v 1.20 2002-08-30 03:12:52 jmarcus Exp $
+ * $Id: cnid_update.c,v 1.20.2.1 2003-09-16 14:21:44 bfernhomberg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -22,7 +22,7 @@
 #include "cnid_private.h"
 
 #ifdef CNID_DB_CDB
-    #define tid    NULL
+#define tid    NULL
 #endif /* CNID_DB_CDB */
 
 /* cnid_update: takes the given cnid and updates the metadata.  To