diff options
Diffstat (limited to 'main/gcc/ada-fixes.patch')
| -rw-r--r-- | main/gcc/ada-fixes.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/main/gcc/ada-fixes.patch b/main/gcc/ada-fixes.patch index 60a16a368e..ba4ea42b4d 100644 --- a/main/gcc/ada-fixes.patch +++ b/main/gcc/ada-fixes.patch @@ -1,20 +1,30 @@ ---- gcc-4.8.1/gcc/ada/terminals.c.orig -+++ gcc-4.8.1/gcc/ada/terminals.c -@@ -984,13 +984,6 @@ +--- gcc-6.1.0.orig/gcc/ada/cal.c ++++ gcc-6.1.0/gcc/ada/cal.c +@@ -49,6 +49,7 @@ + #include <time.h> + #else + #include <sys/time.h> ++#include <time.h> + #endif + + #ifdef __MINGW32__ +--- gcc-6.1.0.orig/gcc/ada/terminals.c ++++ gcc-6.1.0/gcc/ada/terminals.c +@@ -1068,13 +1068,6 @@ #include <stdio.h> #include <stdlib.h> -/* On some system termio is either absent or including it will disable termios - (HP-UX) */ --#if ! defined (__hpux__) && ! defined (FREEBSD) && \ -- ! defined (__APPLE__) && ! defined(__rtems__) +-#if !defined (__hpux__) && !defined (BSD) && !defined (__APPLE__) \ +- && !defined (__rtems__) -# include <termio.h> -#endif - #include <sys/ioctl.h> #include <termios.h> #include <fcntl.h> -@@ -1078,7 +1078,7 @@ +@@ -1169,7 +1162,7 @@ char *slave_name = NULL; #ifdef USE_GETPT @@ -23,13 +33,3 @@ #elif defined (USE_OPENPTY) status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL); #elif defined (USE_CLONE_DEVICE) ---- gcc-4.8.1/gcc/ada/cal.c.orig -+++ gcc-4.8.1/gcc/ada/cal.c -@@ -65,6 +65,7 @@ - #include <time.h> - #else - #include <sys/time.h> -+#include <time.h> - #endif - - #ifdef __MINGW32__ |