Bug#55578: libc6-dev: header files containing constructs fixincludes does not like
Package: libc6-dev
Version: 2.1.2-11
Severity: normal
Development versions of GCC run a picky 'fixincludes' script over
/usr/include. It wants to make corrections to several files. The most
common problem is a word after #else or #endif that is not commentary,
e.g.
#ifndef FOO
#define FOO bar
#endif FOO
This is not allowed by the C standard. There are also C++ style comments
in C headers, a missing prototype (in a comment, but the script doesn't know
that), and some bogus ioctl definitions.
Please apply the appended patch and forward it to the appropriate upstream
maintainers.
I am not sure rpc/rpc_des.h should exist at all - it appears to be
specific to SunOS 4.
zw
-- System Information
Debian Release: potato
Kernel Version: Linux wolery 2.2.14 #1 Wed Jan 5 19:28:11 PST 2000 i686 unknown
Versions of the packages libc6-dev depends on:
ii libc6 2.1.2-11 GNU C Library: Shared libraries and Timezone
-- Suggested Patch
--- /usr/include/rpc/svc.h Sat Dec 25 17:51:00 1999
+++ rpc/svc.h Tue Jan 18 12:25:30 2000
@@ -167,7 +167,7 @@
* SVCXPRT *xprt;
* u_long prog;
* u_long vers;
- * void (*dispatch)();
+ * void (*dispatch)(struct svc_req *, SVCXPRT *);
* u_long protocol; like TCP or UDP, zero means do not register
*/
extern bool_t svc_register __P ((SVCXPRT *__xprt, u_long __prog,
--- /usr/include/rpc/rpc_des.h Sat Dec 25 17:51:00 1999
+++ rpc/rpc_des.h Tue Jan 18 12:05:04 2000
@@ -73,11 +73,11 @@
/*
* Encrypt an arbitrary sized buffer
*/
-#define DESIOCBLOCK _IOWR(d, 6, struct desparams)
+#define DESIOCBLOCK _IOWR('d', 6, struct desparams)
/*
* Encrypt of small amount of data, quickly
*/
-#define DESIOCQUICK _IOWR(d, 7, struct desparams)
+#define DESIOCQUICK _IOWR('d', 7, struct desparams)
#endif
--- /usr/include/asm/mca_dma.h Sun Dec 26 10:44:59 1999
+++ asm/mca_dma.h Tue Jan 18 12:05:10 2000
@@ -123,4 +123,4 @@
outb(mode, MCA_DMA_REG_EXE);
}
-#endif MCA_DMA_H
+#endif
--- /usr/include/linux/fcdevice.h Sun Dec 26 10:44:59 1999
+++ linux/fcdevice.h Tue Jan 18 12:26:25 2000
@@ -31,7 +31,9 @@
unsigned short type, void *daddr,
void *saddr, unsigned len);
extern int fc_rebuild_header(struct sk_buff *skb);
-//extern unsigned short fc_type_trans(struct sk_buff *skb, struct device *dev);
+#if 0
+extern unsigned short fc_type_trans(struct sk_buff *skb, struct device *dev);
+#endif
extern struct device * init_fcdev(struct device *, int);
--- /usr/include/linux/bigphysarea.h Sun Dec 26 10:44:59 1999
+++ linux/bigphysarea.h Tue Jan 18 12:05:22 2000
@@ -29,7 +29,7 @@
extern caddr_t bigphysarea_alloc_pages(int count, int align, int priority);
extern void bigphysarea_free_pages(caddr_t base);
-#endif __LINUX_BIGPHYSAREA_H
+#endif
/* linux/mm/bigphysarea.h, M. Welsh (mdw@cs.cornell.edu)
* Copyright (c) 1996 by Matt Welsh.
* Extended by Roger Butenuth (butenuth@uni-paderborn.de), October 1997
@@ -61,4 +61,4 @@
extern caddr_t bigphysarea_alloc_pages(int count, int align, int priority);
extern void bigphysarea_free_pages(caddr_t base);
-#endif __LINUX_BIGPHYSAREA_H
+#endif
--- /usr/include/linux/coda_cache.h Sun Dec 26 10:44:59 1999
+++ linux/coda_cache.h Tue Jan 18 12:05:26 2000
@@ -74,4 +74,4 @@
#define CFSNC_PRINTSTATS ((u_long) 13)
#define CFSNC_REPLACE ((u_long) 14)
-#endif _CFSNC_HEADER_
+#endif
--- /usr/include/linux/if_frad.h Sun Dec 26 10:44:59 1999
+++ linux/if_frad.h Tue Jan 18 12:05:39 2000
@@ -194,7 +194,7 @@
int (*dlci_ioctl_hook)(unsigned int, void *);
-#endif __KERNEL__
+#endif
#endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */
--- /usr/include/linux/md.h Sun Dec 26 10:44:59 1999
+++ linux/md.h Tue Jan 18 12:05:51 2000
@@ -296,5 +296,5 @@
extern int md_update_sb (int minor);
extern int md_do_sync(struct md_dev *mddev);
-#endif __KERNEL__
-#endif _MD_H
+#endif
+#endif
--- /usr/include/linux/wavefront.h Sun Dec 26 10:45:01 1999
+++ linux/wavefront.h Tue Jan 18 12:06:25 2000
@@ -31,7 +31,7 @@
member, which has the same semantics anyway.
*/
-#endif __GNUC__
+#endif
/***************************** WARNING ********************************
PLEASE DO NOT MODIFY THIS FILE IN ANY WAY THAT AFFECTS ITS ABILITY TO
@@ -40,11 +40,11 @@
#ifndef NUM_MIDIKEYS
#define NUM_MIDIKEYS 128
-#endif NUM_MIDIKEYS
+#endif
#ifndef NUM_MIDICHANNELS
#define NUM_MIDICHANNELS 16
-#endif NUM_MIDICHANNELS
+#endif
/* These are very useful/important. the original wavefront interface
was developed on a 16 bit system, where sizeof(int) = 2
@@ -672,4 +672,4 @@
#define WFFX_MEMSET 69
-#endif __wavefront_h__
+#endif
Reply to: