Merge from emacs-23

[gnu-emacs] / src / s / bsd-common.h

diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index 2a8934d7f50680794665bf2d3d48c6a0ef947fc9..ffb7a637488381b0150a93f49102465279fa5c01 100644 (file)
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -47,8 +47,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define SYSV_SYSTEM_DIR
 
-#define UNEXEC unexelf.o
-
 /* If the system's imake configuration file defines `NeedWidePrototypes'
    as `NO', we must define NARROWPROTO manually.  Such a define is
    generated in the Makefile generated by `xmkmf'.  If we don't
@@ -73,9 +71,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
 #define HAVE_SOCKETS
 
-/* Define this symbol if your system has the functions bcopy, etc. */
-#define BSTRING
-
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */