[Emacs-diffs] /srv/bzr/emacs/trunk r101711: Do not include stdlib.h and string.h, config.h does it.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 101711
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-01 06:56:33 -0700
message:
  Do not include stdlib.h and string.h, config.h does it.
  * src/xfont.c:
  * src/w32term.c:
  * src/w32reg.c:
  * src/w32inevt.c:
  * src/w32heap.c:
  * src/w32console.c:
  * src/w16select.c:
  * src/unexsol.c:
  * src/term.c:
  * src/sound.c:
  * src/scroll.c (m):
  * src/gtkutil.c:
  * src/font.c:
  * src/filelock.c:
  * src/fileio.c:
  * src/dosfns.c:
  * src/dbusbind.c:
  * src/bidi.c:
  * src/callproc.c:
  * src/process.c:
  * src/msdos.c:
  * src/charset.c: Do not include stdlib.h and string.h, config.h does it.
  
  * configure.in: Include stdlib.h and string.h unconditionally.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/bidi.c
  src/callproc.c
  src/charset.c
  src/config.in
  src/dbusbind.c
  src/dosfns.c
  src/fileio.c
  src/filelock.c
  src/font.c
  src/gtkutil.c
  src/msdos.c
  src/process.c
  src/scroll.c
  src/sound.c
  src/term.c
  src/unexsol.c
  src/w16select.c
  src/w32console.c
  src/w32heap.c
  src/w32inevt.c
  src/w32reg.c
  src/w32term.c
  src/xfont.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-09-29 18:52:34 +0000
+++ b/ChangeLog 2010-10-01 13:56:33 +0000
@@ -1,3 +1,7 @@
+2010-10-01  Dan Nicolaescu  <address@hidden>
+
+       * configure.in: Include stdlib.h and string.h unconditionally.
+
 2010-09-29  Romain Francoise  <address@hidden>
 
        * configure.in: Don't enable ImageMagick unless HAVE_X11.

=== modified file 'configure.in'
--- a/configure.in      2010-09-29 18:52:34 +0000
+++ b/configure.in      2010-10-01 13:56:33 +0000
@@ -3607,13 +3607,8 @@
    not define __STDC__ (e.g. DEC C by default) or may define it as zero.  */
 #undef PROTOTYPES
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
-
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-01 13:06:44 +0000
+++ b/src/ChangeLog     2010-10-01 13:56:33 +0000
@@ -1,5 +1,29 @@
 2010-10-01  Dan Nicolaescu  <address@hidden>
 
+       Do not include stdlib.h and string.h, config.h does it.
+       * xfont.c:
+       * w32term.c:
+       * w32reg.c:
+       * w32inevt.c:
+       * w32heap.c:
+       * w32console.c:
+       * w16select.c:
+       * unexsol.c:
+       * term.c:
+       * sound.c:
+       * scroll.c (m):
+       * gtkutil.c:
+       * font.c:
+       * filelock.c:
+       * fileio.c:
+       * dosfns.c:
+       * dbusbind.c:
+       * bidi.c:
+       * callproc.c:
+       * process.c:
+       * msdos.c:
+       * charset.c: Do not include stdlib.h and string.h, config.h does it.
+
        * callproc.c (SIGCHLD): Remove conditional definition, syssignal.h 
defines it.
 
        * process.c: Move #include <pty.h> earlier.
@@ -10,6 +34,7 @@
        * nsmenu.m (syms_of_nsmenu):
        * nsfns.m (syms_of_nsfns):
        * msdos.c (syms_of_msdos):
+
        * image.c (syms_of_image):
        * charset.c (syms_of_charset): Use intern_c_string instead of intern.
 

=== modified file 'src/bidi.c'
--- a/src/bidi.c        2010-09-24 13:05:24 +0000
+++ b/src/bidi.c        2010-10-01 13:56:33 +0000
@@ -51,7 +51,6 @@
 
 #include <config.h>
 #include <stdio.h>
-#include <string.h>
 #include <setjmp.h>
 
 #include "lisp.h"

=== modified file 'src/callproc.c'
--- a/src/callproc.c    2010-10-01 13:06:44 +0000
+++ b/src/callproc.c    2010-10-01 13:56:33 +0000
@@ -38,7 +38,6 @@
 #ifdef WINDOWSNT
 #define NOMINMAX
 #include <windows.h>
-#include <stdlib.h>    /* for proper declaration of environ */
 #include <fcntl.h>
 #include "w32.h"
 #define _P_NOWAIT 1    /* from process.h */

=== modified file 'src/charset.c'
--- a/src/charset.c     2010-10-01 12:25:21 +0000
+++ b/src/charset.c     2010-10-01 13:56:33 +0000
@@ -28,7 +28,6 @@
 #include <config.h>
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/types.h>

=== modified file 'src/config.in'
--- a/src/config.in     2010-09-26 06:06:28 +0000
+++ b/src/config.in     2010-10-01 13:56:33 +0000
@@ -1170,13 +1170,8 @@
    not define __STDC__ (e.g. DEC C by default) or may define it as zero.  */
 #undef PROTOTYPES
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
-
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>

=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c    2010-09-27 23:25:27 +0000
+++ b/src/dbusbind.c    2010-10-01 13:56:33 +0000
@@ -19,7 +19,6 @@
 #include <config.h>
 
 #ifdef HAVE_DBUS
-#include <stdlib.h>
 #include <stdio.h>
 #include <dbus/dbus.h>
 #include <setjmp.h>

=== modified file 'src/dosfns.c'
--- a/src/dosfns.c      2010-08-13 09:21:31 +0000
+++ b/src/dosfns.c      2010-10-01 13:56:33 +0000
@@ -24,7 +24,6 @@
 /* The entire file is within this conditional */
 
 #include <stdio.h>
-#include <string.h>
 #include <dos.h>
 #include <setjmp.h>
 #include "lisp.h"

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2010-09-12 14:35:37 +0000
+++ b/src/fileio.c      2010-10-01 13:56:33 +0000
@@ -71,7 +71,6 @@
 #ifdef WINDOWSNT
 #define NOMINMAX 1
 #include <windows.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #endif /* not WINDOWSNT */
 
@@ -79,7 +78,6 @@
 #include "msdos.h"
 #include <sys/param.h>
 #include <fcntl.h>
-#include <string.h>
 #endif
 
 #ifdef DOS_NT

=== modified file 'src/filelock.c'
--- a/src/filelock.c    2010-08-09 09:35:21 +0000
+++ b/src/filelock.c    2010-10-01 13:56:33 +0000
@@ -34,7 +34,6 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#include <string.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

=== modified file 'src/font.c'
--- a/src/font.c        2010-09-23 12:09:12 +0000
+++ b/src/font.c        2010-10-01 13:56:33 +0000
@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <ctype.h>
 #include <setjmp.h>
 

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2010-09-23 19:00:31 +0000
+++ b/src/gtkutil.c     2010-10-01 13:56:33 +0000
@@ -20,7 +20,6 @@
 #include <config.h>
 
 #ifdef USE_GTK
-#include <string.h>
 #include <signal.h>
 #include <stdio.h>
 #include <setjmp.h>

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2010-10-01 12:25:21 +0000
+++ b/src/msdos.c       2010-10-01 13:56:33 +0000
@@ -29,13 +29,11 @@
 #include <setjmp.h>
 #include "lisp.h"
 #include <stdio.h>
-#include <stdlib.h>
 #include <time.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <dos.h>
 #include <errno.h>
-#include <string.h>     /* for memset and string functions */
 #include <sys/stat.h>    /* for _fixpath */
 #include <unistd.h>     /* for chdir, dup, dup2, etc. */
 #include <dir.h>        /* for getdisk */

=== modified file 'src/process.c'
--- a/src/process.c     2010-10-01 13:04:07 +0000
+++ b/src/process.c     2010-10-01 13:56:33 +0000
@@ -31,7 +31,6 @@
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
 #endif
-#include <stdlib.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

=== modified file 'src/scroll.c'
--- a/src/scroll.c      2010-09-24 15:20:58 +0000
+++ b/src/scroll.c      2010-10-01 13:56:33 +0000
@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include <stdio.h>
-#include <string.h>
 #include <setjmp.h>
 #include "lisp.h"
 #include "termchar.h"

=== modified file 'src/sound.c'
--- a/src/sound.c       2010-08-09 19:25:41 +0000
+++ b/src/sound.c       2010-10-01 13:56:33 +0000
@@ -86,8 +86,6 @@
 
 /* BEGIN: Windows Specific Includes */
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <limits.h>
 #include <windows.h>
 #include <mmsystem.h>

=== modified file 'src/term.c'
--- a/src/term.c        2010-09-27 05:42:43 +0000
+++ b/src/term.c        2010-10-01 13:56:33 +0000
@@ -23,7 +23,6 @@
 #include <config.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <string.h>
 #include <errno.h>
 #include <sys/file.h>
 

=== modified file 'src/unexsol.c'
--- a/src/unexsol.c     2010-01-04 05:35:18 +0000
+++ b/src/unexsol.c     2010-10-01 13:56:33 +0000
@@ -1,7 +1,6 @@
 /* Trivial unexec for Solaris.  */
 
 #include <config.h>
-#include <stdlib.h>
 #include <dlfcn.h>
 #include <setjmp.h>
 

=== modified file 'src/w16select.c'
--- a/src/w16select.c   2010-08-13 09:21:31 +0000
+++ b/src/w16select.c   2010-10-01 13:56:33 +0000
@@ -28,7 +28,6 @@
 #ifdef MSDOS
 
 #include <config.h>
-#include <string.h>
 #include <dpmi.h>
 #include <go32.h>
 #include <sys/farptr.h>

=== modified file 'src/w32console.c'
--- a/src/w32console.c  2010-09-30 00:09:04 +0000
+++ b/src/w32console.c  2010-10-01 13:56:33 +0000
@@ -25,10 +25,8 @@
 
 #include <config.h>
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <windows.h>
-#include <string.h>
 #include <setjmp.h>
 
 #include "lisp.h"

=== modified file 'src/w32heap.c'
--- a/src/w32heap.c     2010-07-06 14:22:29 +0000
+++ b/src/w32heap.c     2010-10-01 13:56:33 +0000
@@ -25,7 +25,6 @@
 #include <config.h>
 #endif
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <setjmp.h>
 

=== modified file 'src/w32inevt.c'
--- a/src/w32inevt.c    2010-07-07 09:45:28 +0000
+++ b/src/w32inevt.c    2010-10-01 13:56:33 +0000
@@ -27,7 +27,6 @@
 #include <config.h>
 #endif
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <windows.h>
 #include <setjmp.h>

=== modified file 'src/w32reg.c'
--- a/src/w32reg.c      2010-07-06 14:22:29 +0000
+++ b/src/w32reg.c      2010-10-01 13:56:33 +0000
@@ -26,7 +26,6 @@
 #include "blockinput.h"
 
 #include <stdio.h>
-#include <string.h>
 
 #define REG_ROOT "SOFTWARE\\GNU\\Emacs"
 

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2010-08-18 16:42:06 +0000
+++ b/src/w32term.c     2010-10-01 13:56:33 +0000
@@ -21,7 +21,6 @@
 #include <config.h>
 #include <signal.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <setjmp.h>
 #include "lisp.h"
 #include "blockinput.h"

=== modified file 'src/xfont.c'
--- a/src/xfont.c       2010-08-08 21:03:45 +0000
+++ b/src/xfont.c       2010-10-01 13:56:33 +0000
@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <setjmp.h>
 #include <X11/Xlib.h>