diff options
| author | Paul Eggert | 2011-02-18 23:28:29 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-18 23:28:29 -0800 |
| commit | 5f90be1bb73a4cb8c277476f2c9c9f59f0074bbb (patch) | |
| tree | 0ae73daf66f91b368b3e4d7b3cb4d5afa4500976 /src | |
| parent | f12f551b2c38748ed10ec8c350faa23516f7c705 (diff) | |
| download | emacs-5f90be1bb73a4cb8c277476f2c9c9f59f0074bbb.tar.gz emacs-5f90be1bb73a4cb8c277476f2c9c9f59f0074bbb.zip | |
Import simpler crypto/md5 module from gnulib, plus stdint module.
* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
* src/config.in: Regenerate.
* lib/md5.c, lib/md5.h: Regenerate with simpler version, which
assumes C99-style <stdint.h>, supplied by the stdint module.
* lib/stdint.in.h, m4/longlong.m4, m4/stdint.m4: New files,
generated from gnulib.
* src/deps.mk (fns.o): Do not depend on md5.h, fixing a typo in
the earlier patch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.in | 59 | ||||
| -rw-r--r-- | src/deps.mk | 2 |
2 files changed, 60 insertions, 1 deletions
diff --git a/src/config.in b/src/config.in index 637287a024c..9e8364ec45b 100644 --- a/src/config.in +++ b/src/config.in | |||
| @@ -31,6 +31,21 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 31 | /* Define if building universal (internal helper macro) */ | 31 | /* Define if building universal (internal helper macro) */ |
| 32 | #undef AC_APPLE_UNIVERSAL_BUILD | 32 | #undef AC_APPLE_UNIVERSAL_BUILD |
| 33 | 33 | ||
| 34 | /* Define to the number of bits in type 'ptrdiff_t'. */ | ||
| 35 | #undef BITSIZEOF_PTRDIFF_T | ||
| 36 | |||
| 37 | /* Define to the number of bits in type 'sig_atomic_t'. */ | ||
| 38 | #undef BITSIZEOF_SIG_ATOMIC_T | ||
| 39 | |||
| 40 | /* Define to the number of bits in type 'size_t'. */ | ||
| 41 | #undef BITSIZEOF_SIZE_T | ||
| 42 | |||
| 43 | /* Define to the number of bits in type 'wchar_t'. */ | ||
| 44 | #undef BITSIZEOF_WCHAR_T | ||
| 45 | |||
| 46 | /* Define to the number of bits in type 'wint_t'. */ | ||
| 47 | #undef BITSIZEOF_WINT_T | ||
| 48 | |||
| 34 | /* Define if Emacs cannot be dumped on your system. */ | 49 | /* Define if Emacs cannot be dumped on your system. */ |
| 35 | #undef CANNOT_DUMP | 50 | #undef CANNOT_DUMP |
| 36 | 51 | ||
| @@ -440,6 +455,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 440 | /* Define to 1 if you support file names longer than 14 characters. */ | 455 | /* Define to 1 if you support file names longer than 14 characters. */ |
| 441 | #undef HAVE_LONG_FILE_NAMES | 456 | #undef HAVE_LONG_FILE_NAMES |
| 442 | 457 | ||
| 458 | /* Define to 1 if the system has the type `long long int'. */ | ||
| 459 | #undef HAVE_LONG_LONG_INT | ||
| 460 | |||
| 443 | /* Define to 1 if you have the `lrand48' function. */ | 461 | /* Define to 1 if you have the `lrand48' function. */ |
| 444 | #undef HAVE_LRAND48 | 462 | #undef HAVE_LRAND48 |
| 445 | 463 | ||
| @@ -596,6 +614,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 596 | /* Define to 1 if you have the `shutdown' function. */ | 614 | /* Define to 1 if you have the `shutdown' function. */ |
| 597 | #undef HAVE_SHUTDOWN | 615 | #undef HAVE_SHUTDOWN |
| 598 | 616 | ||
| 617 | /* Define to 1 if 'sig_atomic_t' is a signed integer type. */ | ||
| 618 | #undef HAVE_SIGNED_SIG_ATOMIC_T | ||
| 619 | |||
| 620 | /* Define to 1 if 'wchar_t' is a signed integer type. */ | ||
| 621 | #undef HAVE_SIGNED_WCHAR_T | ||
| 622 | |||
| 623 | /* Define to 1 if 'wint_t' is a signed integer type. */ | ||
| 624 | #undef HAVE_SIGNED_WINT_T | ||
| 625 | |||
| 599 | /* Define to 1 if the system has the type `size_t'. */ | 626 | /* Define to 1 if the system has the type `size_t'. */ |
| 600 | #undef HAVE_SIZE_T | 627 | #undef HAVE_SIZE_T |
| 601 | 628 | ||
| @@ -665,6 +692,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 665 | /* Define to 1 if you have the `sysinfo' function. */ | 692 | /* Define to 1 if you have the `sysinfo' function. */ |
| 666 | #undef HAVE_SYSINFO | 693 | #undef HAVE_SYSINFO |
| 667 | 694 | ||
| 695 | /* Define to 1 if you have the <sys/bitypes.h> header file. */ | ||
| 696 | #undef HAVE_SYS_BITYPES_H | ||
| 697 | |||
| 698 | /* Define to 1 if you have the <sys/inttypes.h> header file. */ | ||
| 699 | #undef HAVE_SYS_INTTYPES_H | ||
| 700 | |||
| 668 | /* Define to 1 if you have the <sys/loadavg.h> header file. */ | 701 | /* Define to 1 if you have the <sys/loadavg.h> header file. */ |
| 669 | #undef HAVE_SYS_LOADAVG_H | 702 | #undef HAVE_SYS_LOADAVG_H |
| 670 | 703 | ||
| @@ -745,6 +778,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 745 | /* Define to 1 if you have the <unistd.h> header file. */ | 778 | /* Define to 1 if you have the <unistd.h> header file. */ |
| 746 | #undef HAVE_UNISTD_H | 779 | #undef HAVE_UNISTD_H |
| 747 | 780 | ||
| 781 | /* Define to 1 if the system has the type `unsigned long long int'. */ | ||
| 782 | #undef HAVE_UNSIGNED_LONG_LONG_INT | ||
| 783 | |||
| 748 | /* Define to 1 if you have the <util.h> header file. */ | 784 | /* Define to 1 if you have the <util.h> header file. */ |
| 749 | #undef HAVE_UTIL_H | 785 | #undef HAVE_UTIL_H |
| 750 | 786 | ||
| @@ -763,6 +799,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 763 | /* Define to 1 if you have the <vfork.h> header file. */ | 799 | /* Define to 1 if you have the <vfork.h> header file. */ |
| 764 | #undef HAVE_VFORK_H | 800 | #undef HAVE_VFORK_H |
| 765 | 801 | ||
| 802 | /* Define to 1 if you have the <wchar.h> header file. */ | ||
| 803 | #undef HAVE_WCHAR_H | ||
| 804 | |||
| 766 | /* Define if you have the 'wchar_t' type. */ | 805 | /* Define if you have the 'wchar_t' type. */ |
| 767 | #undef HAVE_WCHAR_T | 806 | #undef HAVE_WCHAR_T |
| 768 | 807 | ||
| @@ -915,6 +954,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 915 | /* Define to 1 if the C compiler supports function prototypes. */ | 954 | /* Define to 1 if the C compiler supports function prototypes. */ |
| 916 | #undef PROTOTYPES | 955 | #undef PROTOTYPES |
| 917 | 956 | ||
| 957 | /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type | ||
| 958 | 'ptrdiff_t'. */ | ||
| 959 | #undef PTRDIFF_T_SUFFIX | ||
| 960 | |||
| 918 | /* Define REL_ALLOC if you want to use the relocating allocator for buffer | 961 | /* Define REL_ALLOC if you want to use the relocating allocator for buffer |
| 919 | space. */ | 962 | space. */ |
| 920 | #undef REL_ALLOC | 963 | #undef REL_ALLOC |
| @@ -922,6 +965,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 922 | /* Define as the return type of signal handlers (`int' or `void'). */ | 965 | /* Define as the return type of signal handlers (`int' or `void'). */ |
| 923 | #undef RETSIGTYPE | 966 | #undef RETSIGTYPE |
| 924 | 967 | ||
| 968 | /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type | ||
| 969 | 'sig_atomic_t'. */ | ||
| 970 | #undef SIG_ATOMIC_T_SUFFIX | ||
| 971 | |||
| 972 | /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type | ||
| 973 | 'size_t'. */ | ||
| 974 | #undef SIZE_T_SUFFIX | ||
| 975 | |||
| 925 | /* If using the C implementation of alloca, define if you know the | 976 | /* If using the C implementation of alloca, define if you know the |
| 926 | direction of stack growth for your system; otherwise it will be | 977 | direction of stack growth for your system; otherwise it will be |
| 927 | automatically deduced at runtime. | 978 | automatically deduced at runtime. |
| @@ -985,6 +1036,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 985 | /* Version number of package */ | 1036 | /* Version number of package */ |
| 986 | #undef VERSION | 1037 | #undef VERSION |
| 987 | 1038 | ||
| 1039 | /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type | ||
| 1040 | 'wchar_t'. */ | ||
| 1041 | #undef WCHAR_T_SUFFIX | ||
| 1042 | |||
| 1043 | /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type | ||
| 1044 | 'wint_t'. */ | ||
| 1045 | #undef WINT_T_SUFFIX | ||
| 1046 | |||
| 988 | /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most | 1047 | /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most |
| 989 | significant byte first (like Motorola and SPARC, unlike Intel). */ | 1048 | significant byte first (like Motorola and SPARC, unlike Intel). */ |
| 990 | #if defined AC_APPLE_UNIVERSAL_BUILD | 1049 | #if defined AC_APPLE_UNIVERSAL_BUILD |
diff --git a/src/deps.mk b/src/deps.mk index 5a86f1d2a4b..92da4dd89b0 100644 --- a/src/deps.mk +++ b/src/deps.mk | |||
| @@ -282,7 +282,7 @@ eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h frame.h \ | |||
| 282 | msdos.h | 282 | msdos.h |
| 283 | floatfns.o: floatfns.c syssignal.h lisp.h globals.h $(config_h) | 283 | floatfns.o: floatfns.c syssignal.h lisp.h globals.h $(config_h) |
| 284 | fns.o: fns.c commands.h lisp.h $(config_h) frame.h buffer.h character.h \ | 284 | fns.o: fns.c commands.h lisp.h $(config_h) frame.h buffer.h character.h \ |
| 285 | keyboard.h keymap.h window.h $(INTERVALS_H) coding.h md5.h \ | 285 | keyboard.h keymap.h window.h $(INTERVALS_H) coding.h \ |
| 286 | blockinput.h atimer.h systime.h xterm.h ../lib/unistd.h globals.h | 286 | blockinput.h atimer.h systime.h xterm.h ../lib/unistd.h globals.h |
| 287 | print.o: print.c process.h frame.h window.h buffer.h keyboard.h character.h \ | 287 | print.o: print.c process.h frame.h window.h buffer.h keyboard.h character.h \ |
| 288 | lisp.h globals.h $(config_h) termchar.h $(INTERVALS_H) msdos.h termhooks.h \ | 288 | lisp.h globals.h $(config_h) termchar.h $(INTERVALS_H) msdos.h termhooks.h \ |