diff options
| author | Glenn Morris | 2010-05-13 19:28:28 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-13 19:28:28 -0700 |
| commit | cb027b32957a73af833358c323ba1ec53afc8243 (patch) | |
| tree | 002a226fc671f54890eacaa7c87814007124e63e /src | |
| parent | 14914c431498a802e271ad42cdd6f06175ae4b4a (diff) | |
| download | emacs-cb027b32957a73af833358c323ba1ec53afc8243.tar.gz emacs-cb027b32957a73af833358c323ba1ec53afc8243.zip | |
* s/netbsd.h (AMPERSAND_FULL_NAME): Remove (defined in AH_BOTTOM).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/s/netbsd.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b58bc51d08e..e7f429344fb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-05-14 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * s/netbsd.h (AMPERSAND_FULL_NAME): Remove (defined in AH_BOTTOM). | ||
| 4 | |||
| 1 | 2010-05-13 Glenn Morris <rgm@gnu.org> | 5 | 2010-05-13 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * Makefile.in (FONT_DRIVERS): Place with other HAVE_X_WINDOWS stuff. | 7 | * Makefile.in (FONT_DRIVERS): Place with other HAVE_X_WINDOWS stuff. |
diff --git a/src/s/netbsd.h b/src/s/netbsd.h index b8df9014ecc..4874ec9af56 100644 --- a/src/s/netbsd.h +++ b/src/s/netbsd.h | |||
| @@ -26,8 +26,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 26 | 26 | ||
| 27 | #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) | 27 | #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) |
| 28 | 28 | ||
| 29 | #define AMPERSAND_FULL_NAME | ||
| 30 | |||
| 31 | /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears | 29 | /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears |
| 32 | the library search parth, i.e. it won't search /usr/lib | 30 | the library search parth, i.e. it won't search /usr/lib |
| 33 | for libc and friends. Using -nostartfiles instead avoids | 31 | for libc and friends. Using -nostartfiles instead avoids |