diff options
| author | Glenn Morris | 2012-07-12 19:38:30 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-07-12 19:38:30 -0700 |
| commit | 32fb4bb69b61a2ef5b1d5d1e17e6915ba5d23e5b (patch) | |
| tree | d2296e592da5b9eb573b3ea338ce46ad13210d50 /src | |
| parent | 983188fd542cdf5704929b27f5c17acb30b6f1ad (diff) | |
| download | emacs-32fb4bb69b61a2ef5b1d5d1e17e6915ba5d23e5b.tar.gz emacs-32fb4bb69b61a2ef5b1d5d1e17e6915ba5d23e5b.zip | |
Remove some src/s files that are now empty
* configure.ac (opsysfile): Set to empty on gnu, cygwin.
* src/s/bsd-common, src/s/cygwin.h: Remove empty files.
* src/s/freebsd.h, src/s/netbsd.h: Do not include bsd-common.h.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/s/bsd-common.h | 20 | ||||
| -rw-r--r-- | src/s/cygwin.h | 20 | ||||
| -rw-r--r-- | src/s/freebsd.h | 3 | ||||
| -rw-r--r-- | src/s/netbsd.h | 4 |
5 files changed, 3 insertions, 47 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8baa986fc5c..5d19ea0c782 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-07-13 Glenn Morris <rgm@gnu.org> | 1 | 2012-07-13 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * s/bsd-common, s/cygwin.h: Remove empty files. | ||
| 4 | * s/freebsd.h, s/netbsd.h: Do not include bsd-common.h. | ||
| 5 | |||
| 3 | * s/usg5-4-common.h (USG, USG5): | 6 | * s/usg5-4-common.h (USG, USG5): |
| 4 | * s/template.h (USG5, USG, HPUX, BSD4_2, BSD_SYSTEM): | 7 | * s/template.h (USG5, USG, HPUX, BSD4_2, BSD_SYSTEM): |
| 5 | * s/sol2-6.h (SOLARIS2): | 8 | * s/sol2-6.h (SOLARIS2): |
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h deleted file mode 100644 index 9e8c9ba4726..00000000000 --- a/src/s/bsd-common.h +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | /* Definitions file for GNU Emacs running on bsd 4.3 | ||
| 2 | |||
| 3 | Copyright (C) 1985-1986, 2001-2012 Free Software Foundation, Inc. | ||
| 4 | |||
| 5 | This file is part of GNU Emacs. | ||
| 6 | |||
| 7 | GNU Emacs is free software: you can redistribute it and/or modify | ||
| 8 | it under the terms of the GNU General Public License as published by | ||
| 9 | the Free Software Foundation, either version 3 of the License, or | ||
| 10 | (at your option) any later version. | ||
| 11 | |||
| 12 | GNU Emacs is distributed in the hope that it will be useful, | ||
| 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | GNU General Public License for more details. | ||
| 16 | |||
| 17 | You should have received a copy of the GNU General Public License | ||
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | ||
| 19 | |||
| 20 | |||
diff --git a/src/s/cygwin.h b/src/s/cygwin.h deleted file mode 100644 index 1295083cd8e..00000000000 --- a/src/s/cygwin.h +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | /* System description header file for Cygwin. | ||
| 2 | |||
| 3 | Copyright (C) 1985-1986, 1992, 1999, 2002-2012 Free Software Foundation, Inc. | ||
| 4 | |||
| 5 | This file is part of GNU Emacs. | ||
| 6 | |||
| 7 | GNU Emacs is free software: you can redistribute it and/or modify | ||
| 8 | it under the terms of the GNU General Public License as published by | ||
| 9 | the Free Software Foundation, either version 3 of the License, or | ||
| 10 | (at your option) any later version. | ||
| 11 | |||
| 12 | GNU Emacs is distributed in the hope that it will be useful, | ||
| 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | GNU General Public License for more details. | ||
| 16 | |||
| 17 | You should have received a copy of the GNU General Public License | ||
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | ||
| 19 | |||
| 20 | |||
diff --git a/src/s/freebsd.h b/src/s/freebsd.h index f5838266143..ff31f073427 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h | |||
| @@ -20,9 +20,6 @@ GNU General Public License for more details. | |||
| 20 | You should have received a copy of the GNU General Public License | 20 | You should have received a copy of the GNU General Public License |
| 21 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 21 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 22 | 22 | ||
| 23 | /* Get most of the stuff from bsd-common */ | ||
| 24 | #include "bsd-common.h" | ||
| 25 | |||
| 26 | /* Tell that garbage collector that setjmp is known to save all | 23 | /* Tell that garbage collector that setjmp is known to save all |
| 27 | registers relevant for conservative garbage collection in the jmp_buf. */ | 24 | registers relevant for conservative garbage collection in the jmp_buf. */ |
| 28 | #define GC_SETJMP_WORKS 1 | 25 | #define GC_SETJMP_WORKS 1 |
diff --git a/src/s/netbsd.h b/src/s/netbsd.h index cbcd54f3988..b0e298f2c2e 100644 --- a/src/s/netbsd.h +++ b/src/s/netbsd.h | |||
| @@ -17,10 +17,6 @@ GNU General Public License for more details. | |||
| 17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 19 | ||
| 20 | |||
| 21 | /* Get most of the stuff from bsd-common. */ | ||
| 22 | #include "bsd-common.h" | ||
| 23 | |||
| 24 | /* Greg A. Woods <woods@weird.com> says we must include signal.h | 20 | /* Greg A. Woods <woods@weird.com> says we must include signal.h |
| 25 | before syssignal.h is included, to work around interface conflicts | 21 | before syssignal.h is included, to work around interface conflicts |
| 26 | that are handled with CPP __RENAME() macro in signal.h. */ | 22 | that are handled with CPP __RENAME() macro in signal.h. */ |