Merge from emacs-23

[gnu-emacs] / src / s / cygwin.h

diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index b6d0c7c88ffeee195f0e74519be75883de6f79d1..93df925fcab5c497d2ad929d3cf59b68d9991d8e 100644 (file)
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -73,9 +73,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     }                                                  \
   while (0)
 
-/* 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.  */
@@ -93,7 +90,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 #define SYSV_SYSTEM_DIR 1
-#define UNEXEC unexcw.o
 
 #define HAVE_SOCKETS