Thu Jul 25 00:25:54 Richard Henderson <rth@tamu.edu>

	* nss/nss_db/db-XXX.c: Kill trailing ; from lock defn as a matter of
	course.
	* nss/getXXent_r.c: Likewise.
	* nss/nsswitch.c: Likewise.
	* nss/nss_files/files-XXX.c: Likewise.
	* sysdeps/mach/hurd/dirstream.h (struct __dirstream): Likewise.
	* sysdeps/unix/bsd/telldir.c (struct record): Likewise.
	* sysdeps/unix/dirstream.h (struct __dirstream): Likewise.

diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c
index a4327c8..620eebd 100644 (file)
--- a/nss/getXXent_r.c
+++ b/nss/getXXent_r.c
@@ -94,7 +94,7 @@ static service_user *nip;
 static service_user *startp;
 
 /* Protect above variable against multiple uses at the same time.  */
-__libc_lock_define_initialized (static, lock);
+__libc_lock_define_initialized (static, lock)
 
 /* The lookup function for the first entry of this service.  */
 extern int DB_LOOKUP_FCT (service_user **nip, const char *name, void **fctp);

diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c
index 3f6f35d..792dc5c 100644 (file)
--- a/nss/nss_db/db-XXX.c
+++ b/nss/nss_db/db-XXX.c
@@ -47,7 +47,7 @@ Cambridge, MA 02139, USA.  */
 #endif
 
 /* Locks the static variables in this file.  */
-__libc_lock_define_initialized (static, lock);
+__libc_lock_define_initialized (static, lock)
 \f
 /* Maintenance of the shared handle open on the database.  */
 

diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
index 80efd29..da4ad1f 100644 (file)
--- a/nss/nss_files/files-XXX.c
+++ b/nss/nss_files/files-XXX.c
@@ -49,7 +49,7 @@ Cambridge, MA 02139, USA.  */
 #endif
 
 /* Locks the static variables in this file.  */
-__libc_lock_define_initialized (static, lock);
+__libc_lock_define_initialized (static, lock)
 \f
 /* Maintenance of the shared stream open on the database file.  */
 

diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index d259165..3490594 100644 (file)
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -39,7 +39,7 @@ static service_library *nss_new_service (name_database *database,
                                         const char *name);
 
 
-__libc_lock_define_initialized (static, lock);
+__libc_lock_define_initialized (static, lock)
 
 
 /* Global variable.  */

diff --git a/sysdeps/mach/hurd/dirstream.h b/sysdeps/mach/hurd/dirstream.h
index d17baf2..c13383d 100644 (file)
--- a/sysdeps/mach/hurd/dirstream.h
+++ b/sysdeps/mach/hurd/dirstream.h
@@ -36,7 +36,7 @@ struct __dirstream
     int __entry_ptr;           /* Entry number `__ptr' corresponds to.  */
     unsigned long int __allocation; /* Space allocated for the block.  */
     unsigned long int __size;  /* Total valid data in the block.  */
-    __libc_lock_define (, __lock); /* Mutex lock for this structure.  */
+    __libc_lock_define (, __lock) /* Mutex lock for this structure.  */
   };
 
 #endif /* dirstream.h */

diff --git a/sysdeps/unix/bsd/telldir.c b/sysdeps/unix/bsd/telldir.c
index 4400883..a01b302 100644 (file)
--- a/sysdeps/unix/bsd/telldir.c
+++ b/sysdeps/unix/bsd/telldir.c
@@ -36,7 +36,7 @@ struct record
 #define NBUCKETS 32
 static struct record *records[32];
 static off_t lastpos;
-__libc_lock_define_initialized(static, lock); /* Locks above data.  */
+__libc_lock_define_initialized(static, lock) /* Locks above data.  */
 
 
 /* Return the current position of DIRP.  */

diff --git a/sysdeps/unix/dirstream.h b/sysdeps/unix/dirstream.h
index 3d27967..feeb74e 100644 (file)
--- a/sysdeps/unix/dirstream.h
+++ b/sysdeps/unix/dirstream.h
@@ -40,7 +40,7 @@ struct __dirstream
 
     off_t filepos;             /* Position of next entry to read.  */
 
-    __libc_lock_define (, lock); /* Mutex lock for this structure.  */
+    __libc_lock_define (, lock) /* Mutex lock for this structure.  */
   };
 
 #define _DIR_dirfd(dirp)       ((dirp)->fd)