From: Joe Buehler <jbuehler@hekimian.com>
Subject: [PATCHES] 21.3.50 for Cygwin: patch 5
Date: Fri, 06 Dec 2002 13:36:39 -0500 [thread overview]
Message-ID: <asqqnl$797$3@main.gmane.org> (raw)
This patch fixes various C code issues for Cygwin. Note that the
diff at the end is the new src/s/cygwin.h file.
Joe Buehler
Index: ./lib-src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/ChangeLog,v
retrieving revision 2.212
diff -u -r2.212 ChangeLog
--- ./lib-src/ChangeLog 4 Dec 2002 11:19:42 -0000 2.212
+++ ./lib-src/ChangeLog 6 Dec 2002 17:38:39 -0000
@@ -1,3 +1,7 @@
+2002-12-06 Joe Buehler <jhpb@draco.hekimian.com>
+
+ * pop.c: a Cygwin header file defines _P, so undef it
+
2002-12-04 Richard M. Stallman <rms@gnu.org>
* Update getopt from gnulib version; changes described below.
Index: ./src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.2979
diff -u -r1.2979 ChangeLog
--- ./src/ChangeLog 4 Dec 2002 11:44:42 -0000 1.2979
+++ ./src/ChangeLog 6 Dec 2002 17:39:00 -0000
@@ -1,3 +1,7 @@
+2002-12-06 Joe Buehler <jhpb@draco.hekimian.com>
+
+ * s/cygwin.h: added for Cygwin port
+
2002-12-04 Richard M. Stallman <rms@gnu.org>
* sysdep.c (fcntl.h): Test only HAVE_FCNTL_H.
Index: ./src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.2979
diff -u -r1.2979 ChangeLog
--- ./src/ChangeLog 4 Dec 2002 11:44:42 -0000 1.2979
+++ ./src/ChangeLog 6 Dec 2002 17:39:00 -0000
@@ -1,3 +1,11 @@
+2002-12-06 Joe Buehler <jhpb@draco.hekimian.com>
+
+ * mem-limits.h: added ifdef to define BSD4_2 for Cygwin
+
+ * keyboard.c: port to Cygwin (just added proper preprocessor tests)
+
+ * fileio.c: support // at start of name for Cygwin (just added proper preprocessor tests)
+
2002-12-04 Richard M. Stallman <rms@gnu.org>
* sysdep.c (fcntl.h): Test only HAVE_FCNTL_H.
Index: lib-src/pop.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/pop.c,v
retrieving revision 1.31
diff -u -r1.31 pop.c
--- lib-src/pop.c 17 May 2002 11:24:02 -0000 1.31
+++ lib-src/pop.c 6 Dec 2002 16:34:43 -0000
@@ -119,6 +119,9 @@
#endif
#endif
+#ifdef _P
+#undef _P
+#endif
#ifndef _P
# ifdef __STDC__
# define _P(a) a
cvs server: Diffing lisp
Index: src/fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.466
diff -u -r1.466 fileio.c
--- src/fileio.c 4 Dec 2002 11:44:00 -0000 1.466
+++ src/fileio.c 6 Dec 2002 16:35:27 -0000
@@ -2052,13 +2052,13 @@
for (p = nm; p != endp; p++)
{
if ((p[0] == '~'
-#if defined (APOLLO) || defined (WINDOWSNT)
- /* // at start of file name is meaningful in Apollo and
- WindowsNT systems. */
+#if defined (APOLLO) || defined (WINDOWSNT) || defined(CYGWIN)
+ /* // at start of file name is meaningful in Apollo,
+ WindowsNT and Cygwin systems. */
|| (IS_DIRECTORY_SEP (p[0]) && p - 1 != nm)
-#else /* not (APOLLO || WINDOWSNT) */
+#else /* not (APOLLO || WINDOWSNT || CYGWIN) */
|| IS_DIRECTORY_SEP (p[0])
-#endif /* not (APOLLO || WINDOWSNT) */
+#endif /* not (APOLLO || WINDOWSNT || CYGWIN) */
)
&& p != nm
&& (0
@@ -2230,11 +2230,11 @@
for (p = xnm; p != x; p++)
if ((p[0] == '~'
-#if defined (APOLLO) || defined (WINDOWSNT)
+#if defined (APOLLO) || defined (WINDOWSNT) || defined(CYGWIN)
|| (IS_DIRECTORY_SEP (p[0]) && p - 1 != xnm)
-#else /* not (APOLLO || WINDOWSNT) */
+#else /* not (APOLLO || WINDOWSNT || CYGWIN) */
|| IS_DIRECTORY_SEP (p[0])
-#endif /* not (APOLLO || WINDOWSNT) */
+#endif /* not (APOLLO || WINDOWSNT || CYGWIN) */
)
&& p != xnm && IS_DIRECTORY_SEP (p[-1]))
xnm = p;
Index: src/keyboard.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keyboard.c,v
retrieving revision 1.716
diff -u -r1.716 keyboard.c
--- src/keyboard.c 22 Nov 2002 12:23:13 -0000 1.716
+++ src/keyboard.c 6 Dec 2002 16:35:33 -0000
@@ -6492,7 +6492,7 @@
if (n_to_read > sizeof cbuf)
n_to_read = sizeof cbuf;
#else /* no FIONREAD */
-#if defined (USG) || defined (DGUX)
+#if defined (USG) || defined (DGUX) || defined(CYGWIN)
/* Read some input if available, but don't wait. */
n_to_read = sizeof cbuf;
fcntl (input_fd, F_SETFL, O_NDELAY);
@@ -6549,9 +6549,9 @@
);
#ifndef FIONREAD
-#if defined (USG) || defined (DGUX)
+#if defined (USG) || defined (DGUX) || defined (CYGWIN)
fcntl (input_fd, F_SETFL, 0);
-#endif /* USG or DGUX */
+#endif /* USG or DGUX or CYGWIN */
#endif /* no FIONREAD */
for (i = 0; i < nread; i++)
{
Index: src/mem-limits.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/mem-limits.h,v
retrieving revision 1.31
diff -u -r1.31 mem-limits.h
--- src/mem-limits.h 19 Aug 2002 17:45:50 -0000 1.31
+++ src/mem-limits.h 6 Dec 2002 16:35:33 -0000
@@ -46,6 +46,10 @@
#define BSD4_2
#endif
+#ifdef CYGWIN
+#define BSD4_2
+#endif
+
#ifndef BSD4_2
#ifndef USG
#ifndef MSDOS
--- src/s/cygwin.h 2002-12-06 12:58:52.000000000 -0500
+++ src/s/cygwin.h 2002-12-05 16:47:00.000000000 -0500
@@ -0,0 +1,146 @@
+/* Template for system description header files.
+ This file describes the parameters that system description files
+ should define or not.
+ Copyright (C) 1985, 1986, 1992, 1999 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+/* SYSTEM_TYPE should indicate the kind of system you are using.
+ It sets the Lisp variable system-type. */
+
+#define SYSTEM_TYPE "cygwin"
+
+/* Emacs can read input using SIGIO and buffering characters itself,
+ or using CBREAK mode and making C-g cause SIGINT.
+ The choice is controlled by the variable interrupt_input.
+
+ Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
+
+ Emacs uses the presence or absence of the SIGIO and BROKEN_SIGIO macros
+ to indicate whether or not signal-driven I/O is possible. It uses
+ INTERRUPT_INPUT to decide whether to use it by default.
+
+ SIGIO can be used only on systems that implement it (4.2 and 4.3).
+ CBREAK mode has two disadvantages
+ 1) At least in 4.2, it is impossible to handle the Meta key properly.
+ I hear that in system V this problem does not exist.
+ 2) Control-G causes output to be discarded.
+ I do not know whether this can be fixed in system V.
+
+ Another method of doing input is planned but not implemented.
+ It would have Emacs fork off a separate process
+ to read the input and send it to the true Emacs process
+ through a pipe. */
+
+#undef INTERRUPT_INPUT
+
+/*
+ * Define HAVE_TERMIOS if the system provides POSIX-style
+ * functions and macros for terminal control.
+ *
+ * Define HAVE_TERMIO if the system provides sysV-style ioctls
+ * for terminal control.
+ *
+ * Do not define both. HAVE_TERMIOS is preferred, if it is
+ * supported on your system.
+ */
+
+#define HAVE_TERMIOS
+
+/*
+ * Define HAVE_PTYS if the system supports pty devices.
+ */
+
+#define HAVE_PTYS
+#define PTY_ITERATION for (i = 0; i < 1; i++) /* ick */
+#define PTY_NAME_SPRINTF /* none */
+#define PTY_TTY_NAME_SPRINTF /* none */
+#define PTY_OPEN \
+ do \
+ { \
+ int dummy; \
+ SIGMASKTYPE mask; \
+ mask = sigblock (sigmask (SIGCHLD)); \
+ if (-1 == openpty (&fd, &dummy, pty_name, 0, 0)) \
+ fd = -1; \
+ sigsetmask (mask); \
+ emacs_close (dummy); \
+ } \
+ while (0)
+
+/* Define this symbol if your system has the functions bcopy, etc. */
+
+#define BSTRING
+
+/* subprocesses should be defined if you want to
+ have code for asynchronous subprocesses
+ (as used in M-x compile and M-x shell).
+ This is generally OS dependent, and not supported
+ under most USG systems. */
+
+#define subprocesses
+
+/* 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. */
+
+#define CLASH_DETECTION
+
+/* 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
+ define NARROWPROTO, we will see the wrong function prototypes
+ for X functions taking float or double parameters. */
+
+#define NARROWPROTO 1
+
+/* used in various places to enable cygwin-specific code changes */
+#define CYGWIN 1
+
+#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
+#define GETPGRP_NO_ARG 1
+#define SYSV_SYSTEM_DIR 1
+/* -lutil comes from inetutils and has pty functions in it */
+#define LIBS_SYSTEM -lutil
+/* undumping is not implemented yet */
+#define CANNOT_DUMP 1
+#define POSIX_SIGNALS 1
+/* force the emacs image to start high in memory, so dll relocation
+ can put things in low memory without causing all sorts of grief for
+ emacs lisp pointers */
+#define DATA_SEG_BITS 0x20000000
+#define LINKER $(CC) -Wl,--image-base,DATA_SEG_BITS
+/* gettext.h is in a strange place */
+#define C_SWITCH_SYSTEM -I/usr/share/gettext
+
+/* Use terminfo instead of termcap. Fewer environment variables to
+ go wrong, more terminal types. */
+#define TERMINFO
+
+#define HAVE_SOCKETS
+/* C-g aborts emacs without this */
+/*#define HAVE_VFORK*/
+/* Xaw3d causes problems -- might have been fixed by NARROWPROTO
+ above, but I haven't tried it */
+#undef HAVE_XAW3D
+
+/* vfork() interacts badly with setsid(), causing ptys to fail to
+ change their controlling terminal */
+#define vfork fork
+
+/* the end */
next reply other threads:[~2002-12-06 18:36 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-12-06 18:36 Joe Buehler [this message]
2002-12-25 6:12 ` [PATCHES] 21.3.50 for Cygwin: patch 5 Eli Zaretskii
2002-12-26 13:15 ` Juanma Barranquero
2002-12-26 23:39 ` Richard Stallman
2002-12-27 7:46 ` Juanma Barranquero
2002-12-28 21:22 ` Richard Stallman
2003-01-03 16:19 ` Joe Buehler
2003-01-04 4:19 ` Richard Stallman
2003-01-05 0:31 ` Kim F. Storm
2003-01-05 16:45 ` Benjamin Riefenstahl
2003-01-06 0:13 ` Kim F. Storm
2003-01-06 13:45 ` Joe Buehler
2003-01-06 17:13 ` Richard Stallman
2003-01-07 9:47 ` Kim F. Storm
2003-01-07 18:44 ` Richard Stallman
2003-01-08 23:52 ` Kim F. Storm
2003-01-09 23:14 ` Richard Stallman
2003-01-10 9:49 ` Kim F. Storm
2003-01-10 19:44 ` Eli Zaretskii
2003-01-11 0:02 ` Kim F. Storm
2003-01-12 11:55 ` Richard Stallman
2003-01-11 0:22 ` Richard Stallman
2003-01-05 18:34 ` [PATCHES] " Richard Stallman
2003-01-04 10:07 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='asqqnl$797$3@main.gmane.org' \
--to=jbuehler@hekimian.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.