[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100543: Remove INCLUDED_FCNTL.
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100543: Remove INCLUDED_FCNTL. |
Date: |
Mon, 07 Jun 2010 20:02:41 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100543
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Mon 2010-06-07 20:02:41 -0700
message:
Remove INCLUDED_FCNTL.
* xterm.c (INCLUDED_FCNTL):
* callproc.c (INCLUDED_FCNTL):
* alloc.c (INCLUDED_FCNTL):
* systty.h (INCLUDED_FCNTL): Remove all uses, not needed anymore.
(emacs_get_tty, emacs_set_tty): Declare unconditionally.
modified:
src/ChangeLog
src/alloc.c
src/callproc.c
src/systty.h
src/xterm.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-06-07 18:28:02 +0000
+++ b/src/ChangeLog 2010-06-08 03:02:41 +0000
@@ -1,3 +1,12 @@
+2010-06-08 Dan Nicolaescu <address@hidden>
+
+ Remove INCLUDED_FCNTL.
+ * xterm.c (INCLUDED_FCNTL):
+ * callproc.c (INCLUDED_FCNTL):
+ * alloc.c (INCLUDED_FCNTL):
+ * systty.h (INCLUDED_FCNTL): Remove all uses, not needed anymore.
+ (emacs_get_tty, emacs_set_tty): Declare unconditionally.
+
2010-06-07 Martin Rudalics <address@hidden>
* window.c (Fselect_window): Move `record_buffer' up to the
=== modified file 'src/alloc.c'
--- a/src/alloc.c 2010-04-20 01:50:52 +0000
+++ b/src/alloc.c 2010-06-08 03:02:41 +0000
@@ -70,7 +70,6 @@
#endif
#ifdef HAVE_FCNTL_H
-#define INCLUDED_FCNTL
#include <fcntl.h>
#endif
#ifndef O_WRONLY
=== modified file 'src/callproc.c'
--- a/src/callproc.c 2010-05-27 23:30:11 +0000
+++ b/src/callproc.c 2010-06-08 03:02:41 +0000
@@ -39,7 +39,6 @@
#include <sys/file.h>
#ifdef HAVE_FCNTL_H
-#define INCLUDED_FCNTL
#include <fcntl.h>
#endif
@@ -53,7 +52,6 @@
#endif
#ifdef MSDOS /* Demacs 1.1.1 91/10/16 HIRANO Satoshi */
-#define INCLUDED_FCNTL
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/param.h>
=== modified file 'src/systty.h'
--- a/src/systty.h 2010-05-06 19:46:47 +0000
+++ b/src/systty.h 2010-06-08 03:02:41 +0000
@@ -27,17 +27,13 @@
#ifndef NO_TERMIO
#include <termio.h>
#endif /* not NO_TERMIO */
-#ifndef INCLUDED_FCNTL
-#define INCLUDED_FCNTL
#include <fcntl.h>
-#endif
#else /* not HAVE_TERMIO */
#ifdef HAVE_TERMIOS
#ifndef NO_TERMIO
#include <termio.h>
#endif
#include <termios.h>
-#define INCLUDED_FCNTL
#include <fcntl.h>
#else /* neither HAVE_TERMIO nor HAVE_TERMIOS */
#ifndef DOS_NT
@@ -247,10 +243,8 @@
expression, so we moved them out to their own functions in sysdep.c. */
#define EMACS_GET_TTY(fd, p) (emacs_get_tty ((fd), (p)))
#define EMACS_SET_TTY(fd, p, waitp) (emacs_set_tty ((fd), (p), (waitp)))
-#ifdef P_ /* Unfortunately this file is sometimes included before lisp.h */
-extern int emacs_get_tty P_ ((int, struct emacs_tty *));
-extern int emacs_set_tty P_ ((int, struct emacs_tty *, int));
-#endif
+extern int emacs_get_tty (int, struct emacs_tty *);
+extern int emacs_set_tty (int, struct emacs_tty *, int);
/* Define EMACS_TTY_TABS_OK. */
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2010-05-06 09:34:56 +0000
+++ b/src/xterm.c 2010-06-08 03:02:41 +0000
@@ -56,9 +56,7 @@
#include "systime.h"
-#ifndef INCLUDED_FCNTL
#include <fcntl.h>
-#endif
#include <ctype.h>
#include <errno.h>
#include <setjmp.h>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100543: Remove INCLUDED_FCNTL.,
Dan Nicolaescu <=