From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-8059-listarch-libc-hacker=sources.redhat.com@sources.redhat.com>
Received: (qmail 10730 invoked by alias); 20 Nov 2004 00:15:30 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 10654 invoked from network); 20 Nov 2004 00:15:26 -0000
Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.15.26)
  by sourceware.org with SMTP; 20 Nov 2004 00:15:26 -0000
Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id iAK0CaTN003861;
	Sat, 20 Nov 2004 01:12:36 +0100
Received: (from jakub@localhost)
	by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id iAK0CZDl003859;
	Sat, 20 Nov 2004 01:12:35 +0100
Date: Sat, 20 Nov 2004 00:15:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Fix bits/socket.h
Message-ID: <20041120001235.GE23824@sunsite.ms.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
X-SW-Source: 2004-11/txt/msg00049.txt.bz2

Hi!

gcc -std=c89 -pedantic-errors doesn't like extra comma after SCM_RIGHTS.
Fixed thusly.

2004-11-20  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/bits/socket.h (SCM_RIGHTS): Avoid
	comma at the end of enum if __USE_BSD is not defined.

--- libc/sysdeps/unix/sysv/linux/bits/socket.h.jj	2004-09-14 00:33:04.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/bits/socket.h	2004-11-20 01:10:12.765310641 +0100
@@ -283,10 +283,10 @@ __NTH (__cmsg_nxthdr (struct msghdr *__m
    <linux/socket.h>.  */
 enum
   {
-    SCM_RIGHTS = 0x01,		/* Transfer file descriptors.  */
+    SCM_RIGHTS = 0x01		/* Transfer file descriptors.  */
 #define SCM_RIGHTS SCM_RIGHTS
 #ifdef __USE_BSD
-    SCM_CREDENTIALS = 0x02	/* Credentials passing.  */
+    , SCM_CREDENTIALS = 0x02	/* Credentials passing.  */
 # define SCM_CREDENTIALS SCM_CREDENTIALS
 #endif
   };

	Jakub