Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 146294 Details for
Bug 168281
app-misc/screen-4.0.3 with sys-libs/uclibc-0.9.28.1 - In file included from screen.h:42, from screen.c:82: sched.h:26: error: redefinition of 'struct event'
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Wrapping all local headers
screen-4.0.3-wrap-local-headers.patch (text/plain), 7.62 KB, created by
Sergey Dryabzhinsky
on 2008-03-16 11:00:44 UTC
(
hide
)
Description:
Wrapping all local headers
Filename:
MIME Type:
Creator:
Sergey Dryabzhinsky
Created:
2008-03-16 11:00:44 UTC
Size:
7.62 KB
patch
obsolete
>diff -urN screen-4.0.3-orig/acls.h screen-4.0.3/acls.h >--- screen-4.0.3-orig/acls.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/acls.h 2008-03-16 13:34:59.000000000 +0300 >@@ -21,6 +21,9 @@ > **************************************************************** > */ > >+#ifndef _SCREEN_ACLS_H_ >+#define _SCREEN_ACLS_H_ >+ > #ifdef MULTIUSER > > /* three known bits: */ >@@ -91,3 +94,4 @@ > > extern int DefaultEsc, DefaultMetaEsc; > >+#endif /* define _SCREEN_ACLS_H_ */ >diff -urN screen-4.0.3-orig/ansi.h screen-4.0.3/ansi.h >--- screen-4.0.3-orig/ansi.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/ansi.h 2008-03-16 13:33:19.000000000 +0300 >@@ -22,6 +22,9 @@ > * $Id: ansi.h,v 1.6 1994/05/31 12:31:28 mlschroe Exp $ FAU > */ > >+#ifndef _SCREEN_ANSI_H_ >+#define _SCREEN_ANSI_H_ >+ > #define NATTR 6 > > #define ATTR_DI 0 /* Dim mode */ >@@ -168,3 +171,5 @@ > # define dw_left(ml, x, enc) 0 > # define dw_right(ml, x, enc) 0 > #endif >+ >+#endif /* define _SCREEN_ANSI_H_ */ >diff -urN screen-4.0.3-orig/braille.h screen-4.0.3/braille.h >--- screen-4.0.3-orig/braille.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/braille.h 2008-03-16 13:30:42.000000000 +0300 >@@ -25,6 +25,9 @@ > * $Id: braille.h,v 1.1 1995/09/06 15:51:18 jnweiger Exp jnweiger $ FAU > */ > >+#ifndef _SCREEN_BRAILLE_H_ >+#define _SCREEN_BRAILLE_H_ >+ > #ifdef HAVE_BRAILLE > > extern void StartBraille __P((void)); >@@ -81,3 +84,5 @@ > #define BD_FORE bd.bd_dpy->d_fore > > #endif >+ >+#endif /* define _SCREEN_BRAILLE_H_ */ >diff -urN screen-4.0.3-orig/display.h screen-4.0.3/display.h >--- screen-4.0.3-orig/display.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/display.h 2008-03-16 13:33:38.000000000 +0300 >@@ -22,6 +22,9 @@ > * $Id: display.h,v 1.9 1994/05/31 12:31:54 mlschroe Exp $ FAU > */ > >+#ifndef _SCREEN_DISPLAY_H_ >+#define _SCREEN_DISPLAY_H_ >+ > #ifdef MAPKEYS > > #define KMAP_KEYS (T_OCAPS-T_CAPS) >@@ -343,3 +346,5 @@ > #define HSTATUS_MESSAGE 2 > #define HSTATUS_HS 3 > #define HSTATUS_ALWAYS (1<<2) >+ >+#endif /* define _SCREEN_DISPLAY_H_ */ >diff -urN screen-4.0.3-orig/extern.h screen-4.0.3/extern.h >--- screen-4.0.3-orig/extern.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/extern.h 2008-03-16 13:34:09.000000000 +0300 >@@ -22,6 +22,9 @@ > * $Id: extern.h,v 1.18 1994/05/31 12:31:57 mlschroe Exp $ FAU > */ > >+#ifndef _SCREEN_EXTERN_H_ >+#define _SCREEN_EXTERN_H_ >+ > #if !defined(__GNUC__) || __GNUC__ < 2 > #undef __attribute__ > #define __attribute__(x) >@@ -490,3 +493,5 @@ > # endif > #endif > extern int EncodeChar __P((char *, int, int, int *)); >+ >+#endif /* define _SCREEN_EXTERN_H_ */ >diff -urN screen-4.0.3-orig/image.h screen-4.0.3/image.h >--- screen-4.0.3-orig/image.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/image.h 2008-03-16 13:38:39.000000000 +0300 >@@ -22,6 +22,8 @@ > * $Id: image.h,v 1.9 1994/05/31 12:31:54 mlschroe Exp $ FAU > */ > >+#ifndef _SCREEN_IMAGE_H_ >+#define _SCREEN_IMAGE_H_ > > #undef IFFONT > #undef IFCOLOR >@@ -161,3 +163,5 @@ > # define cole2i(c) ((c) ^ 9) > # endif > #endif >+ >+#endif /* define _SCREEN_IMAGE_H_ */ >diff -urN screen-4.0.3-orig/layer.h screen-4.0.3/layer.h >--- screen-4.0.3-orig/layer.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/layer.h 2008-03-16 13:31:55.000000000 +0300 >@@ -22,6 +22,9 @@ > * $Id: overlay.h,v 1.3 1994/05/31 12:32:31 mlschroe Exp $ FAU > */ > >+#ifndef _SCREEN_LAYER_H_ >+#define _SCREEN_LAYER_H_ >+ > /* > * This is the overlay structure. It is used to create a seperate > * layer over the current windows. >@@ -103,3 +106,4 @@ > display = olddisplay; \ > } while(0) > >+#endif /* define _SCREEN_LAYER_H_ */ >diff -urN screen-4.0.3-orig/logfile.h screen-4.0.3/logfile.h >--- screen-4.0.3-orig/logfile.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/logfile.h 2008-03-16 13:32:10.000000000 +0300 >@@ -22,6 +22,9 @@ > * $Id: logfile.h,v 1.11 1994/05/31 12:33:27 jnweiger Exp $ FAU > */ > >+#ifndef _SCREEN_LOGFILE_H_ >+#define _SCREEN_LOGFILE_H_ >+ > struct logfile > { > struct logfile *next; >@@ -80,3 +83,5 @@ > * It closes fd and opens wantfd to access whatever fd accessed. > */ > int lf_move_fd __P((int fd, int wantfd)); >+ >+#endif /* define _SCREEN_LOGFILE_H_ */ >diff -urN screen-4.0.3-orig/mark.h screen-4.0.3/mark.h >--- screen-4.0.3-orig/mark.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/mark.h 2008-03-16 13:32:31.000000000 +0300 >@@ -22,6 +22,9 @@ > * $Id: mark.h,v 1.1.1.1 1993/06/16 23:51:13 jnweiger Exp $ FAU > */ > >+#ifndef _SCREEN_MARK_H_ >+#define _SCREEN_MARK_H_ >+ > struct markdata > { > struct win *md_window;/* pointer to window we are working on */ >@@ -47,3 +50,4 @@ > #define W2D(y) ((y) - markdata->hist_offset) > #define D2W(y) ((y) + markdata->hist_offset) > >+#endif /* define _SCREEN_MARK_H_ */ >diff -urN screen-4.0.3-orig/osdef.h.in screen-4.0.3/osdef.h.in >--- screen-4.0.3-orig/osdef.h.in 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/osdef.h.in 2008-03-16 13:31:31.000000000 +0300 >@@ -28,6 +28,9 @@ > **************************************************************** > */ > >+#ifndef _SCREEN_OSDEF_H_ >+#define _SCREEN_OSDEF_H_ >+ > extern int printf __P((char *, ...)); > extern int fprintf __P((FILE *, char *, ...)); > extern int sprintf __P((char *, char *, ...)); >@@ -199,3 +202,4 @@ > extern int getloadavg(double *, int); > #endif > >+#endif /* define _SCREEN_OSDEF_H_ */ >diff -urN screen-4.0.3-orig/os.h screen-4.0.3/os.h >--- screen-4.0.3-orig/os.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/os.h 2008-03-16 13:32:47.000000000 +0300 >@@ -22,6 +22,9 @@ > * $Id: os.h,v 1.10 1994/05/31 12:32:22 mlschroe Exp $ FAU > */ > >+#ifndef _SCREEN_OS_H_ >+#define _SCREEN_OS_H_ >+ > #include <stdio.h> > #include <errno.h> > >@@ -531,3 +534,4 @@ > */ > #define IOSIZE 4096 > >+#endif /* define _SCREEN_OS_H_ */ >diff -urN screen-4.0.3-orig/patchlevel.h screen-4.0.3/patchlevel.h >--- screen-4.0.3-orig/patchlevel.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/patchlevel.h 2008-03-16 13:35:19.000000000 +0300 >@@ -524,9 +524,14 @@ > * -- DISTRIBUTED > */ > >+#ifndef _SCREEN_PATCHLEVEL_H_ >+#define _SCREEN_PATCHLEVEL_H_ >+ > #define ORIGIN "FAU" > #define REV 4 > #define VERS 0 > #define PATCHLEVEL 3 > #define DATE "23-Oct-06" > #define STATE "" >+ >+#endif /* define _SCREEN_PATCHLEVEL_H_ */ >diff -urN screen-4.0.3-orig/sched.h screen-4.0.3/sched.h >--- screen-4.0.3-orig/sched.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/sched.h 2008-03-16 13:40:57.000000000 +0300 >@@ -22,6 +22,11 @@ > * $Id: sched.h,v 1.1.1.1 1993/06/16 23:51:13 jnweiger Exp $ FAU > */ > >+#ifndef _SCREEN_SCHED_H_ >+#define _SCREEN_SCHED_H_ >+ >+#include <sys/types.h> >+ > struct event > { > struct event *next; >@@ -41,3 +46,5 @@ > #define EV_READ 1 > #define EV_WRITE 2 > #define EV_ALWAYS 3 >+ >+#endif /* define _SCREEN_SCHED_H_ */ >diff -urN screen-4.0.3-orig/screen.h screen-4.0.3/screen.h >--- screen-4.0.3-orig/screen.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/screen.h 2008-03-16 13:34:24.000000000 +0300 >@@ -22,6 +22,9 @@ > * $Id: screen.h,v 1.12 1994/05/31 12:32:54 mlschroe Exp $ FAU > */ > >+#ifndef _SCREEN_SCREEN_H_ >+#define _SCREEN_SCREEN_H_ >+ > #include "os.h" > > #if defined(__STDC__) >@@ -293,3 +296,5 @@ > */ > #define WLIST_NUM 0 > #define WLIST_MRU 1 >+ >+#endif /* define _SCREEN_SCREEN_H_ */ >diff -urN screen-4.0.3-orig/window.h screen-4.0.3/window.h >--- screen-4.0.3-orig/window.h 2008-03-16 13:20:23.000000000 +0300 >+++ screen-4.0.3/window.h 2008-03-16 13:33:53.000000000 +0300 >@@ -22,6 +22,8 @@ > * $Id: window.h,v 1.11 1994/05/31 12:33:27 mlschroe Exp $ FAU > */ > >+#ifndef _SCREEN_WINDOW_H_ >+#define _SCREEN_WINDOW_H_ > > /* keep this in sync with the initialisations in window.c */ > struct NewWindow >@@ -315,3 +317,5 @@ > : &fore->w_mlines[y - fore->w_histheight]) > > #define Layer2Window(l) ((struct win *)(l)->l_bottom->l_data) >+ >+#endif /* define _SCREEN_WINDOW_H_ */
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 168281
:
113534
|
113797
|
113798
|
113800
|
135740
| 146294 |
178365