[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100751: Clean up include guards.
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100751: Clean up include guards. |
Date: |
Wed, 07 Jul 2010 21:55:07 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100751
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Wed 2010-07-07 21:55:07 -0700
message:
Clean up include guards.
* src/tparam.c: Remove include guards for config.h, string.h and code
that assumes #ifndef emacs.
* src/termcap.c:
* src/unexalpha.c:
* src/sysdep.c:
* src/filemode.c:
* src/filelock.c:
* src/bidi.c: Likewise.
modified:
src/ChangeLog
src/bidi.c
src/filelock.c
src/filemode.c
src/sysdep.c
src/termcap.c
src/tparam.c
src/unexalpha.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-07-08 03:31:04 +0000
+++ b/src/ChangeLog 2010-07-08 04:55:07 +0000
@@ -1,5 +1,15 @@
2010-07-08 Dan Nicolaescu <address@hidden>
+ Clean up include guards.
+ * tparam.c: Remove include guards for config.h, string.h and code
+ that assumes #ifndef emacs.
+ * termcap.c:
+ * unexalpha.c:
+ * sysdep.c:
+ * filemode.c:
+ * filelock.c:
+ * bidi.c: Likewise.
+
Remove prefix-args.c
* prefix-args.c: Remove file.
* autodeps.mk (ALLOBJS): Remove reference to prefix-args.
=== modified file 'src/bidi.c'
--- a/src/bidi.c 2010-07-04 07:50:25 +0000
+++ b/src/bidi.c 2010-07-08 04:55:07 +0000
@@ -49,16 +49,9 @@
rule X9 and to its modifications decribed in the "Implementation
Notes" section of UAX#9, under "Retaining Format Codes". */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
#include <stdio.h>
-
-#ifdef HAVE_STRING_H
#include <string.h>
-#endif
-
#include <setjmp.h>
#include "lisp.h"
=== modified file 'src/filelock.c'
--- a/src/filelock.c 2010-07-04 07:50:25 +0000
+++ b/src/filelock.c 2010-07-08 04:55:07 +0000
@@ -34,9 +34,7 @@
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
-#ifdef HAVE_STRING_H
#include <string.h>
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
=== modified file 'src/filemode.c'
--- a/src/filemode.c 2010-07-04 07:50:25 +0000
+++ b/src/filemode.c 2010-07-08 04:55:07 +0000
@@ -17,10 +17,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
#include <sys/types.h>
#include <sys/stat.h>
=== modified file 'src/sysdep.c'
--- a/src/sysdep.c 2010-07-08 03:03:52 +0000
+++ b/src/sysdep.c 2010-07-08 04:55:07 +0000
@@ -18,10 +18,7 @@
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
#include <ctype.h>
#include <signal.h>
#include <stdio.h>
=== modified file 'src/termcap.c'
--- a/src/termcap.c 2010-07-07 22:18:28 +0000
+++ b/src/termcap.c 2010-07-08 04:55:07 +0000
@@ -18,12 +18,7 @@
Boston, MA 02110-1301, USA. */
/* Emacs config.h may rename various library functions such as malloc. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-#ifdef emacs
-
#include <setjmp.h>
#include <lisp.h> /* xmalloc is here */
/* Get the O_* definitions for open et al. */
@@ -35,26 +30,6 @@
#include <unistd.h>
#endif
-#else /* not emacs */
-
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#include <string.h>
-#else
-char *getenv ();
-char *malloc ();
-char *realloc ();
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#endif /* not emacs */
-
#ifndef NULL
#define NULL (char *) 0
#endif
@@ -84,37 +59,6 @@
#define TERMCAP_FILE "/etc/termcap"
#endif
-#ifndef emacs
-static void
-memory_out ()
-{
- write (2, "virtual memory exhausted\n", 25);
- exit (1);
-}
-
-static char *
-xmalloc (size)
- unsigned size;
-{
- register char *tem = malloc (size);
-
- if (!tem)
- memory_out ();
- return tem;
-}
-
-static char *
-xrealloc (ptr, size)
- char *ptr;
- unsigned size;
-{
- register char *tem = realloc (ptr, size);
-
- if (!tem)
- memory_out ();
- return tem;
-}
-#endif /* not emacs */
/* Looking up capabilities in the entry already found. */
=== modified file 'src/tparam.c'
--- a/src/tparam.c 2010-07-07 22:18:28 +0000
+++ b/src/tparam.c 2010-07-08 04:55:07 +0000
@@ -18,61 +18,14 @@
Boston, MA 02110-1301, USA. */
/* Emacs config.h may rename various library functions such as malloc. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-#ifdef emacs
#include <setjmp.h>
#include "lisp.h" /* for xmalloc */
-#else
-
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#include <string.h>
-#else
-char *malloc ();
-char *realloc ();
-#endif
-
-#endif /* not emacs */
#ifndef NULL
#define NULL (char *) 0
#endif
-#ifndef emacs
-static void
-memory_out ()
-{
- write (2, "virtual memory exhausted\n", 25);
- exit (1);
-}
-
-static char *
-xmalloc (size)
- unsigned size;
-{
- register char *tem = malloc (size);
-
- if (!tem)
- memory_out ();
- return tem;
-}
-
-static char *
-xrealloc (ptr, size)
- char *ptr;
- unsigned size;
-{
- register char *tem = realloc (ptr, size);
-
- if (!tem)
- memory_out ();
- return tem;
-}
-#endif /* not emacs */
-
/* Assuming STRING is the value of a termcap string entry
containing `%' constructs to expand parameters,
merge in parameter values and store result in block OUTSTRING points to.
=== modified file 'src/unexalpha.c'
--- a/src/unexalpha.c 2010-07-08 03:03:52 +0000
+++ b/src/unexalpha.c 2010-07-08 04:55:07 +0000
@@ -28,9 +28,7 @@
#include <sys/mman.h>
#include <stdio.h>
#include <errno.h>
-#ifdef HAVE_STRING_H
#include <string.h>
-#endif
#if !defined (__NetBSD__) && !defined (__OpenBSD__)
#include <filehdr.h>
#include <aouthdr.h>
- [Emacs-diffs] /srv/bzr/emacs/trunk r100751: Clean up include guards.,
Dan Nicolaescu <=