aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2010-10-04 10:22:57 -0700
committerDan Nicolaescu2010-10-04 10:22:57 -0700
commit3e6ae1a4ae2f54ad70a528ee3d4fac992b964eaa (patch)
tree13597dfdaff9729ca7cbf0165c0c166c6a31a36c
parent8028ed5c1cf7a67264689790a6f7160e86160486 (diff)
downloademacs-3e6ae1a4ae2f54ad70a528ee3d4fac992b964eaa.tar.gz
emacs-3e6ae1a4ae2f54ad70a528ee3d4fac992b964eaa.zip
Remove O_RDONLY, O_WRONLY definitions, not needed.
* src/unexcoff.c: * src/lread.c: * src/fileio.c: * src/doc.c: * src/callproc.c: * src/alloc.c: * src/termcap.c: Remove O_RDONLY O_WRONLY definitions.
-rw-r--r--src/ChangeLog11
-rw-r--r--src/alloc.c3
-rw-r--r--src/callproc.c8
-rw-r--r--src/doc.c4
-rw-r--r--src/fileio.c8
-rw-r--r--src/lread.c3
-rw-r--r--src/termcap.c8
-rw-r--r--src/unexcoff.c8
8 files changed, 13 insertions, 40 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 960602a6d08..7c907dd45ef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
12010-10-04 Dan Nicolaescu <dann@ics.uci.edu>
2
3 Remove O_RDONLY, O_WRONLY definitions, not needed.
4 * unexcoff.c:
5 * lread.c:
6 * fileio.c:
7 * doc.c:
8 * callproc.c:
9 * alloc.c:
10 * termcap.c: Remove O_RDONLY O_WRONLY definitions.
11
12010-10-03 Teodor Zlatanov <tzz@lifelogs.com> 122010-10-03 Teodor Zlatanov <tzz@lifelogs.com>
2 13
3 * gnutls.h (GNUTLS_LOG2): Convenience macro. 14 * gnutls.h (GNUTLS_LOG2): Convenience macro.
diff --git a/src/alloc.c b/src/alloc.c
index 0ab4f9f8f85..fa39c1ee5dc 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -66,9 +66,6 @@ extern POINTER_TYPE *sbrk ();
66#endif 66#endif
67 67
68#include <fcntl.h> 68#include <fcntl.h>
69#ifndef O_WRONLY
70#define O_WRONLY 1
71#endif
72 69
73#ifdef WINDOWSNT 70#ifdef WINDOWSNT
74#include "w32.h" 71#include "w32.h"
diff --git a/src/callproc.c b/src/callproc.c
index ee587605f7a..29e13bbc4a7 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -45,14 +45,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
45#include <sys/param.h> 45#include <sys/param.h>
46#endif /* MSDOS */ 46#endif /* MSDOS */
47 47
48#ifndef O_RDONLY
49#define O_RDONLY 0
50#endif
51
52#ifndef O_WRONLY
53#define O_WRONLY 1
54#endif
55
56#include "lisp.h" 48#include "lisp.h"
57#include "commands.h" 49#include "commands.h"
58#include "buffer.h" 50#include "buffer.h"
diff --git a/src/doc.c b/src/doc.c
index 0e9714b4512..7caa88a7b5e 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -31,10 +31,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
31#include <unistd.h> 31#include <unistd.h>
32#endif 32#endif
33 33
34#ifndef O_RDONLY
35#define O_RDONLY 0
36#endif
37
38#include "lisp.h" 34#include "lisp.h"
39#include "buffer.h" 35#include "buffer.h"
40#include "keyboard.h" 36#include "keyboard.h"
diff --git a/src/fileio.c b/src/fileio.c
index a2daf7f15c9..36b6cc3ca8b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -100,14 +100,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
100 100
101#include "commands.h" 101#include "commands.h"
102 102
103#ifndef O_WRONLY
104#define O_WRONLY 1
105#endif
106
107#ifndef O_RDONLY
108#define O_RDONLY 0
109#endif
110
111#ifndef S_ISLNK 103#ifndef S_ISLNK
112# define lstat stat 104# define lstat stat
113#endif 105#endif
diff --git a/src/lread.c b/src/lread.c
index 69e9a4629d2..66b1a8068c2 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -55,9 +55,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
55#endif /* HAVE_SETLOCALE */ 55#endif /* HAVE_SETLOCALE */
56 56
57#include <fcntl.h> 57#include <fcntl.h>
58#ifndef O_RDONLY
59#define O_RDONLY 0
60#endif
61 58
62#ifdef HAVE_FSEEKO 59#ifdef HAVE_FSEEKO
63#define file_offset off_t 60#define file_offset off_t
diff --git a/src/termcap.c b/src/termcap.c
index a8eabf25529..03476b15761 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -20,22 +20,18 @@ Boston, MA 02110-1301, USA. */
20/* Emacs config.h may rename various library functions such as malloc. */ 20/* Emacs config.h may rename various library functions such as malloc. */
21#include <config.h> 21#include <config.h>
22#include <setjmp.h> 22#include <setjmp.h>
23#include <lisp.h> /* xmalloc is here */
24/* Get the O_* definitions for open et al. */
25#include <sys/file.h> 23#include <sys/file.h>
26#include <fcntl.h> 24#include <fcntl.h>
27#ifdef HAVE_UNISTD_H 25#ifdef HAVE_UNISTD_H
28#include <unistd.h> 26#include <unistd.h>
29#endif 27#endif
30 28
29#include "lisp.h"
30
31#ifndef NULL 31#ifndef NULL
32#define NULL (char *) 0 32#define NULL (char *) 0
33#endif 33#endif
34 34
35#ifndef O_RDONLY
36#define O_RDONLY 0
37#endif
38
39/* BUFSIZE is the initial size allocated for the buffer 35/* BUFSIZE is the initial size allocated for the buffer
40 for reading the termcap file. 36 for reading the termcap file.
41 It is not a limit. 37 It is not a limit.
diff --git a/src/unexcoff.c b/src/unexcoff.c
index 428382e4a3d..0c6af414d82 100644
--- a/src/unexcoff.c
+++ b/src/unexcoff.c
@@ -97,14 +97,6 @@ struct aouthdr
97 97
98#include <sys/file.h> 98#include <sys/file.h>
99 99
100#ifndef O_RDONLY
101#define O_RDONLY 0
102#endif
103#ifndef O_RDWR
104#define O_RDWR 2
105#endif
106
107
108extern char *start_of_data (void); /* Start of initialized data */ 100extern char *start_of_data (void); /* Start of initialized data */
109 101
110static long block_copy_start; /* Old executable start point */ 102static long block_copy_start; /* Old executable start point */