mirror of https://gitee.com/openkylin/gpm.git
Fix FTBFS with glibc 2.26
Origin: http://downloads.nutyx.org/x86_64/development/base/gpm/gpm-1.20.7-glibc-2.26-1.patch Bug: https://github.com/telmich/gpm/issues/21 Bug-Debian: https://bugs.debian.org/886903 Bug-LFS: http://wiki.linuxfromscratch.org/blfs/ticket/9616#ticket Gbp-Pq: Name 94_gpm-1.20.7-glibc-2.26-1.patch
This commit is contained in:
parent
4fb0a9e9c9
commit
7b643237fa
|
@ -24,6 +24,10 @@
|
|||
#include <sys/ioctl.h> /* ioctl */
|
||||
#include <sys/types.h> /* major() */
|
||||
|
||||
#ifdef HAVE_SYS_SYSMACROS_H
|
||||
#include <sys/sysmacros.h> /* major() w/newer glibc */
|
||||
#endif
|
||||
|
||||
/* Linux specific (to be outsourced in gpm2 */
|
||||
#include <linux/serial.h> /* for serial console check */
|
||||
#include <asm/ioctls.h> /* for serial console check */
|
||||
|
|
|
@ -443,6 +443,7 @@ void f__fix(struct passwd *pass)
|
|||
}
|
||||
|
||||
/*---------------------------------------------------------------------*/
|
||||
#if 0
|
||||
static int f_debug_one(FILE *f, Draw *draw)
|
||||
{
|
||||
DrawItem *ip;
|
||||
|
@ -465,6 +466,7 @@ static int f_debug_one(FILE *f, Draw *draw)
|
|||
#undef LINE
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
int f_debug(int mode, DrawItem *self, int uid)
|
||||
{
|
||||
|
@ -960,10 +962,8 @@ static inline void scr_dump(int fd, FILE *f, unsigned char *buffer, int vc)
|
|||
/*------------*/
|
||||
static inline void scr_restore(int fd, FILE *f, unsigned char *buffer, int vc)
|
||||
{
|
||||
int x,y, dumpfd;
|
||||
int dumpfd;
|
||||
char dumpname[20];
|
||||
|
||||
x=buffer[2]; y=buffer[3];
|
||||
|
||||
/* WILL NOT WORK WITH DEVFS! FIXME! */
|
||||
sprintf(dumpname,"/dev/vcsa%i",vc);
|
||||
|
@ -1196,11 +1196,7 @@ int main(int argc, char **argv)
|
|||
LOG_DAEMON : LOG_USER);
|
||||
/* reap your zombies */
|
||||
childaction.sa_handler=reap_children;
|
||||
#if defined(__GLIBC__)
|
||||
__sigemptyset(&childaction.sa_mask);
|
||||
#else /* __GLIBC__ */
|
||||
childaction.sa_mask=0;
|
||||
#endif /* __GLIBC__ */
|
||||
sigemptyset(&childaction.sa_mask);
|
||||
childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
|
||||
sigaction(SIGCHLD,&childaction,NULL);
|
||||
|
||||
|
|
Loading…
Reference in New Issue