commit/XEmacs: Jerry James: Fix reversed test for the insert-data-in-exec build rule in
11 years, 9 months
Bitbucket
1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/0e2f2837c2bd/
changeset: 0e2f2837c2bd
user: Jerry James
date: 2013-03-07 05:05:12
summary: Fix reversed test for the insert-data-in-exec build rule in
lib-src/Makefile.in.in. See xemacs-beta message
<CAHCOHQm+qhM5qLLhBGBfQB5hw9XzcVDJLb4fRMAc=kqRj=sddA(a)mail.gmail.com>.
affected #: 2 files
diff -r 86d33ddc7fd67d96d462cdcebad9eda3371ee854 -r 0e2f2837c2bde37a9d9d26744e9829e0c5547239 lib-src/ChangeLog
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-06 Jerry James <james(a)xemacs.org>
+
+ * Makefile.in.in: Fix reversed test for insert-data-in-exec build.
+
2013-03-04 Jerry James <james(a)xemacs.org>
* insert-data-in-exec.c (main): Use OFF_T, FSEEK, and FTELL macros,
diff -r 86d33ddc7fd67d96d462cdcebad9eda3371ee854 -r 0e2f2837c2bde37a9d9d26744e9829e0c5547239 lib-src/Makefile.in.in
--- a/lib-src/Makefile.in.in
+++ b/lib-src/Makefile.in.in
@@ -376,7 +376,7 @@
make-dump-id: ${srcdir}/make-dump-id.c
$(CC) $(cflags) ${srcdir}/make-dump-id.c $(ldflags) -o $@
-#ifndef DUMP_IN_EXEC
+#ifdef DUMP_IN_EXEC
insert-data-in-exec: ${srcdir}/insert-data-in-exec.c
$(CC) $(cflags) ${srcdir}/insert-data-in-exec.c $(ldflags) -o $@
#endif /* not DUMP_IN_EXEC */
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
Re: [AC 21.5] Large file support
11 years, 9 months
Jerry James
APPROVE COMMIT 21.5
On Wed, Mar 6, 2013 at 3:54 PM, Vin Shelton <acs(a)alumni.princeton.edu> wrote:
> All my 21.5 builds are failing like this:
We've had a reversed test in lib-src/Makefile.in.in since 8 Apr 2005,
and nobody noticed until now. This should make things better.
diff -r 86d33ddc7fd6 lib-src/ChangeLog
--- a/lib-src/ChangeLog Wed Mar 06 08:32:17 2013 -0700
+++ b/lib-src/ChangeLog Wed Mar 06 21:02:03 2013 -0700
@@ -1,3 +1,7 @@
+2013-03-06 Jerry James <james(a)xemacs.org>
+
+ * Makefile.in.in: Fix reversed test for insert-data-in-exec build.
+
2013-03-04 Jerry James <james(a)xemacs.org>
* insert-data-in-exec.c (main): Use OFF_T, FSEEK, and FTELL macros,
diff -r 86d33ddc7fd6 lib-src/Makefile.in.in
--- a/lib-src/Makefile.in.in Wed Mar 06 08:32:17 2013 -0700
+++ b/lib-src/Makefile.in.in Wed Mar 06 21:02:03 2013 -0700
@@ -376,7 +376,7 @@
make-dump-id: ${srcdir}/make-dump-id.c
$(CC) $(cflags) ${srcdir}/make-dump-id.c $(ldflags) -o $@
-#ifndef DUMP_IN_EXEC
+#ifdef DUMP_IN_EXEC
insert-data-in-exec: ${srcdir}/insert-data-in-exec.c
$(CC) $(cflags) ${srcdir}/insert-data-in-exec.c $(ldflags) -o $@
#endif /* not DUMP_IN_EXEC */
Regards,
--
Jerry James
http://www.jamezone.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/xemacs-packages: 3 new changesets
11 years, 9 months
Bitbucket
3 new commits in xemacs-packages:
https://bitbucket.org/xemacs/xemacs-packages/commits/e53bdb3f1a95/
changeset: e53bdb3f1a95
user: Norbert Koch
date: 2013-03-06 22:34:05
summary: Update cc-mode
affected #: 1 file
diff -r 38538c1776988b4fcfdca40975ee74c173f1bf5b -r e53bdb3f1a95bbdcbb2b2b6843244d3eabe0983b .hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -17,7 +17,7 @@
da4e7d4a51c502e5ac05a224cb756f382f0ba4d7 xemacs-packages/c-support
11074b3808d1e349f3fddb3c4d50f8be7c0f859e xemacs-packages/calc
7524e4fb9de45d77812090a724fac4ebd7549d6e xemacs-packages/calendar
-b4501405b143d497cb09de252ad6916ae20e8cfe xemacs-packages/cc-mode
+f3461758abf62bd22f7ff3cda68350b83b0b0adb xemacs-packages/cc-mode
a7ae1cfb2376bcd32617c1c88afe08872b11d298 xemacs-packages/cedet-common
87dd21fac17ea98219267b1378b4696698d6c4ff xemacs-packages/clearcase
e18acdbfcd36295d052cd56fa2e6d78c68b4b7d4 xemacs-packages/cogre
https://bitbucket.org/xemacs/xemacs-packages/commits/9f923c2e5f87/
changeset: 9f923c2e5f87
user: Norbert Koch
date: 2013-03-06 22:34:59
summary: XEmacs Package Release
affected #: 1 file
diff -r e53bdb3f1a95bbdcbb2b2b6843244d3eabe0983b -r 9f923c2e5f8726f0588a027226a30017286fbe4e ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-06 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: cc-mode.
+
2013-02-22 Norbert Koch <viteno(a)xemacs.org>
* Packages released: xemacs-base, os-utils.
https://bitbucket.org/xemacs/xemacs-packages/commits/dc50ae4b2010/
changeset: dc50ae4b2010
user: Norbert Koch
date: 2013-03-06 22:41:43
summary: pre-released cc-mode
affected #: 1 file
diff -r 9f923c2e5f8726f0588a027226a30017286fbe4e -r dc50ae4b2010867a5a2ca023d84e1e88b96ed824 .hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -17,7 +17,7 @@
da4e7d4a51c502e5ac05a224cb756f382f0ba4d7 xemacs-packages/c-support
11074b3808d1e349f3fddb3c4d50f8be7c0f859e xemacs-packages/calc
7524e4fb9de45d77812090a724fac4ebd7549d6e xemacs-packages/calendar
-f3461758abf62bd22f7ff3cda68350b83b0b0adb xemacs-packages/cc-mode
+97eb4da19f27d981a95eca114c012b88aa34b07c xemacs-packages/cc-mode
a7ae1cfb2376bcd32617c1c88afe08872b11d298 xemacs-packages/cedet-common
87dd21fac17ea98219267b1378b4696698d6c4ff xemacs-packages/clearcase
e18acdbfcd36295d052cd56fa2e6d78c68b4b7d4 xemacs-packages/cogre
Repository URL: https://bitbucket.org/xemacs/xemacs-packages/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/cc-mode: 2 new changesets
11 years, 9 months
Bitbucket
2 new commits in cc-mode:
https://bitbucket.org/xemacs/cc-mode/commits/72acccbc8a91/
changeset: 72acccbc8a91
user: Norbert Koch
date: 2013-03-06 22:34:59
summary: XEmacs Package Release 1.64
affected #: 2 files
diff -r f3461758abf62bd22f7ff3cda68350b83b0b0adb -r 72acccbc8a915392dd763ba2f8fc8495707caa83 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-06 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.64 released.
+
2013-02-08 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.63 released.
diff -r f3461758abf62bd22f7ff3cda68350b83b0b0adb -r 72acccbc8a915392dd763ba2f8fc8495707caa83 Makefile
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.63
+VERSION = 1.64
AUTHOR_VERSION = 5.32.2
MAINTAINER = Alan Mackenzie <bug-cc-mode(a)gnu.org>
PACKAGE = cc-mode
https://bitbucket.org/xemacs/cc-mode/commits/97eb4da19f27/
changeset: 97eb4da19f27
user: Norbert Koch
date: 2013-03-06 22:34:59
summary: Added tag cc-mode-1_64 for changeset 72acccbc8a91
affected #: 1 file
diff -r 72acccbc8a915392dd763ba2f8fc8495707caa83 -r 97eb4da19f27d981a95eca114c012b88aa34b07c .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -95,3 +95,4 @@
84035315a6ee61c74a5ebd43dab790318c1cc9a3 cc-mode-1_60
193c0f9dbfbac71e083f2974efc724a82d1106c5 cc-mode-1_62
b855e452c23959bb9efcd397f3739ba11ad97718 cc-mode-1_63
+72acccbc8a915392dd763ba2f8fc8495707caa83 cc-mode-1_64
Repository URL: https://bitbucket.org/xemacs/cc-mode/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/XEmacs: Jerry James: Avoid EOVERFLOW from stat() calls due to overflowing inode numbers.
11 years, 9 months
Bitbucket
1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/86d33ddc7fd6/
changeset: 86d33ddc7fd6
user: Jerry James
date: 2013-03-06 16:32:17
summary: Avoid EOVERFLOW from stat() calls due to overflowing inode numbers.
The btrfs filesystem now uses 64-bit inode numbers even on 32-bit systems.
This can lead to spurious stat() failures, where EOVERFLOW is returned because
the inode number does not fit into the 32-bit stat structure, even when the
caller is not interested in the inode number. This patch builds with
_FILE_OFFSET_BITS == 64 when possible, and deals with integers that may be
too large to fit into a Lisp fixnum. For more information, see xemacs-patches
message <CAHCOHQk_mPM6WgFChBsGafqhuazep6VED7swFoqfFXOV1r8org(a)mail.gmail.com>.
affected #: 9 files
diff -r 179f4a9201b5e056371ea83f50879a2384d69157 -r 86d33ddc7fd67d96d462cdcebad9eda3371ee854 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-04 Jerry James <james(a)xemacs.org>
+
+ * configure.ac: Check for large file support.
+
2013-03-04 Jerry James <james(a)xemacs.org>
* configure.ac: Complete removal of need_modules_common, forgotten
diff -r 179f4a9201b5e056371ea83f50879a2384d69157 -r 86d33ddc7fd67d96d462cdcebad9eda3371ee854 configure
--- a/configure
+++ b/configure
@@ -1049,6 +1049,7 @@
with_purify
enable_valgrind
with_valgrind
+enable_largefile
with_x
'
ac_precious_vars='build_alias
@@ -2030,6 +2031,12 @@
--with-purify Support memory debugging using Purify.
--with-valgrind Support memory debugging using Valgrind.
+Optional Features:
+ --disable-option-checking ignore unrecognized --enable/--with options
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-largefile omit support for large files
+
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
@@ -11709,6 +11716,308 @@
fi
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+ enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_sys_largefile_CC=no
+ if test "$GCC" != yes; then
+ ac_save_CC=$CC
+ while :; do
+ # IRIX 6.2 and later do not support large files by default,
+ # so use the C compiler's -n32 option if that helps.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+ break
+fi
+rm -f core conftest.err conftest.$ac_objext
+ CC="$CC -n32"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+ break
+ done
+ CC=$ac_save_CC
+ rm -f conftest.$ac_ext
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+ if test "$ac_cv_sys_largefile_CC" != no; then
+ CC=$CC$ac_cv_sys_largefile_CC
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_file_offset_bits=unknown
+ break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+ no | unknown) ;;
+ *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+ if test $ac_cv_sys_file_offset_bits = unknown; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_large_files=unknown
+ break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+ no | unknown) ;;
+ *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+ fi
+
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_source+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h> /* for off_t */
+ #include <stdio.h>
+int
+main ()
+{
+int (*fp) (FILE *, off_t, int) = fseeko;
+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_sys_largefile_source=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _LARGEFILE_SOURCE 1
+#include <sys/types.h> /* for off_t */
+ #include <stdio.h>
+int
+main ()
+{
+int (*fp) (FILE *, off_t, int) = fseeko;
+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_sys_largefile_source=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_cv_sys_largefile_source=unknown
+ break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
+$as_echo "$ac_cv_sys_largefile_source" >&6; }
+case $ac_cv_sys_largefile_source in #(
+ no | unknown) ;;
+ *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+_ACEOF
+;;
+esac
+rm -rf conftest*
+
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+# in glibc 2.1.3, but that breaks too many other things.
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+if test $ac_cv_sys_largefile_source != unknown; then
+
+$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
+
+fi
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
+$as_echo_n "checking size of off_t... " >&6; }
+if ${ac_cv_sizeof_off_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_off_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (off_t)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_off_t=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
+$as_echo "$ac_cv_sizeof_off_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
+_ACEOF
+
+
+
ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin"
if test "x$ac_cv_func_sin" = xyes; then :
diff -r 179f4a9201b5e056371ea83f50879a2384d69157 -r 86d33ddc7fd67d96d462cdcebad9eda3371ee854 configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2721,6 +2721,11 @@
dnl check for long file names
AC_SYS_LONG_FILE_NAMES
+dnl check for large file support
+AC_SYS_LARGEFILE
+AC_FUNC_FSEEKO
+AC_CHECK_SIZEOF(off_t)
+
dnl -lm is required for floating point support, among other things
AC_CHECK_FUNC(sin, ,AC_CHECK_LIB(m, sin))
diff -r 179f4a9201b5e056371ea83f50879a2384d69157 -r 86d33ddc7fd67d96d462cdcebad9eda3371ee854 lib-src/ChangeLog
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-04 Jerry James <james(a)xemacs.org>
+
+ * insert-data-in-exec.c (main): Use OFF_T, FSEEK, and FTELL macros,
+ and adjust variable types and printf specifiers for large file
+ support on supporting systems.
+
2013-01-04 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.33 "horseradish" is released.
diff -r 179f4a9201b5e056371ea83f50879a2384d69157 -r 86d33ddc7fd67d96d462cdcebad9eda3371ee854 lib-src/insert-data-in-exec.c
--- a/lib-src/insert-data-in-exec.c
+++ b/lib-src/insert-data-in-exec.c
@@ -32,6 +32,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <config.h>
static const unsigned char key[] = {
255,
@@ -55,8 +56,9 @@
{
FILE *te, *xe, *dump;
unsigned char *xed, *p;
- long size, size_dump, size1, i;
- long max_size, offset;
+ size_t size, size_dump, size1, i;
+ size_t max_size, offset;
+ OFF_T off;
char msg[65536];
@@ -73,24 +75,25 @@
exit(1);
}
- if(fseek(dump, 0, SEEK_END)) {
+ if(FSEEK(dump, 0, SEEK_END)) {
perror("fseek end dump");
exit(1);
}
- size = ftell(dump);
- if(size == -1) {
+ off = FTELL(dump);
+ if(off == -1) {
perror("ftell dump");
exit(1);
}
+ size = (size_t)off;
- printf("%ld\n", size);
+ printf("%zu\n", size);
exit(0);
}
- max_size = strtol(argv[4], 0, 10);
- offset = strtol(argv[5], 0, 10);
+ max_size = strtoul(argv[4], 0, 10);
+ offset = strtoul(argv[5], 0, 10);
sprintf(msg, "Opening %s failed", argv[1]);
te = fopen(argv[1], "rb");
@@ -99,18 +102,19 @@
exit(1);
}
- if(fseek(te, 0, SEEK_END)) {
+ if(FSEEK(te, 0, SEEK_END)) {
perror("fseek end");
exit(1);
}
- size = ftell(te);
- if(size == -1) {
+ off = FTELL(te);
+ if(off == -1) {
perror("ftell");
exit(1);
}
+ size = (size_t)off;
- if(fseek(te, 0, SEEK_SET)) {
+ if(FSEEK(te, 0, SEEK_SET)) {
perror("fseek beginning");
exit(1);
}
@@ -127,7 +131,7 @@
perror("fread temacs");
exit(1);
}
- fprintf(stderr, "Fread returned %ld, expected %ld ?\n", size1, size);
+ fprintf(stderr, "Fread returned %zu, expected %zu ?\n", size1, size);
exit(1);
}
@@ -137,7 +141,7 @@
}
p = xed;
- for(i=0; i<size-(long)sizeof(key); i++) {
+ for(i=0; i<size-sizeof(key); i++) {
if(!memcmp(p, key, sizeof(key)))
goto found;
p++;
@@ -147,7 +151,7 @@
exit(1);
found:
- fprintf(stderr, "dumped_data found at offset 0x%lx, patching.\n", i);
+ fprintf(stderr, "dumped_data found at offset 0x%zx, patching.\n", i);
sprintf(msg, "Opening %s failed", argv[2]);
dump = fopen(argv[2], "rb");
@@ -156,23 +160,24 @@
exit(1);
}
- if(fseek(dump, 0, SEEK_END)) {
+ if(FSEEK(dump, 0, SEEK_END)) {
perror("fseek end dump");
exit(1);
}
- size_dump = ftell(dump);
- if(size_dump == -1) {
+ off = FTELL(dump);
+ if(off == -1) {
perror("ftell dump");
exit(1);
}
+ size_dump = (size_t)off;
if(size_dump > max_size) {
- fprintf(stderr, "Dump file too big for available space (max=%ld, dump=%ld)\n", max_size, size_dump);
+ fprintf(stderr, "Dump file too big for available space (max=%zu, dump=%zu)\n", max_size, size_dump);
exit(2);
}
- if(fseek(dump, 0, SEEK_SET)) {
+ if(FSEEK(dump, 0, SEEK_SET)) {
perror("fseek beginning dump");
exit(1);
}
@@ -183,7 +188,7 @@
perror("fread dump");
exit(1);
}
- fprintf(stderr, "Fread dump returned %ld, expected %ld ?\n", size1, size_dump);
+ fprintf(stderr, "Fread dump returned %zu, expected %zu ?\n", size1, size_dump);
exit(1);
}
@@ -199,7 +204,7 @@
xed[i+2] = size_dump >> 16;
xed[i+3] = size_dump >> 24;
- fprintf(stderr, "dumped_data found at offset 0x%lx, patching.\n", i);
+ fprintf(stderr, "dumped_data found at offset 0x%zx, patching.\n", i);
sprintf(msg, "Opening %s failed", argv[3]);
xe = fopen(argv[3], "wb");
@@ -214,7 +219,7 @@
perror("fwrite xemacs");
exit(1);
}
- fprintf(stderr, "Fwrite xemacs returned %ld, expected %ld ?\n", size1, size);
+ fprintf(stderr, "Fwrite xemacs returned %zu, expected %zu ?\n", size1, size);
exit(1);
}
diff -r 179f4a9201b5e056371ea83f50879a2384d69157 -r 86d33ddc7fd67d96d462cdcebad9eda3371ee854 src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2013-03-04 Jerry James <james(a)xemacs.org>
+
+ * config.h.in: Add placeholders and definitions needed for large
+ file support.
+ * dired.c (Ffile_attributes): Some elements of the stat structure
+ can overflow a fixnum. Allow them to be bignums, if possible.
+ * dumper.c (pdump_align_stream): Use OFF_T, FTELL, and FSEEK macros
+ to get large file support.
+ (pdump): Ditto.
+
2013-03-02 Jerry James <james(a)xemacs.org>
* Makefile.in.in: If modules are built into the executable, assume
diff -r 179f4a9201b5e056371ea83f50879a2384d69157 -r 86d33ddc7fd67d96d462cdcebad9eda3371ee854 src/config.h.in
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -757,6 +757,19 @@
#undef SIZEOF_LONG_LONG
#undef SIZEOF_VOID_P
#undef SIZEOF_DOUBLE
+#undef SIZEOF_OFF_T
+
+/* Large file support */
+#undef AC_FUNC_FSEEKO
+#ifdef AC_FUNC_FSEEKO
+# define OFF_T off_t
+# define FSEEK(stream, offset, whence) fseeko (stream, offset, whence)
+# define FTELL(stream) ftello (stream)
+#else
+# define OFF_T long
+# define FSEEK(stream, offset, whence) fseek (stream, offset, whence)
+# define FTELL(stream) ftell (stream)
+#endif
/* some systems (Cygwin) typedef u?intptr_t in <sys/types.h>
but the standard is <inttypes.h>
diff -r 179f4a9201b5e056371ea83f50879a2384d69157 -r 86d33ddc7fd67d96d462cdcebad9eda3371ee854 src/dired.c
--- a/src/dired.c
+++ b/src/dired.c
@@ -927,17 +927,17 @@
RETURN_UNGCPRO (listn (12,
mode,
- make_fixnum (s.st_nlink),
- make_fixnum (s.st_uid),
- make_fixnum (s.st_gid),
+ make_integer (s.st_nlink),
+ make_integer (s.st_uid),
+ make_integer (s.st_gid),
make_time (s.st_atime),
make_time (s.st_mtime),
make_time (s.st_ctime),
size,
modestring,
gid,
- make_fixnum (s.st_ino),
- make_fixnum (s.st_dev)));
+ make_integer (s.st_ino),
+ make_integer (s.st_dev)));
}
diff -r 179f4a9201b5e056371ea83f50879a2384d69157 -r 86d33ddc7fd67d96d462cdcebad9eda3371ee854 src/dumper.c
--- a/src/dumper.c
+++ b/src/dumper.c
@@ -203,10 +203,10 @@
inline static void
pdump_align_stream (FILE *stream, Bytecount alignment)
{
- long offset = ftell (stream);
- long adjustment = ALIGN_SIZE (offset, alignment) - offset;
+ OFF_T offset = FTELL (stream);
+ OFF_T adjustment = ALIGN_SIZE (offset, alignment) - offset;
if (adjustment)
- fseek (stream, adjustment, SEEK_CUR);
+ FSEEK (stream, adjustment, SEEK_CUR);
}
#define PDUMP_ALIGN_OUTPUT(type) pdump_align_stream (pdump_out, ALIGNOF (type))
@@ -2168,7 +2168,7 @@
elt->fcts->convert_free(elt->object, elt->data, elt->size);
}
- fseek (pdump_out, header.stab_offset, SEEK_SET);
+ FSEEK (pdump_out, header.stab_offset, SEEK_SET);
#ifdef NEW_GC
{
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/cc-mode: acm: Correct the position of point in some line-up functions.
11 years, 9 months
Bitbucket
1 new commit in cc-mode:
https://bitbucket.org/xemacs/cc-mode/commits/f3461758abf6/
changeset: f3461758abf6
user: acm
date: 2013-03-06 13:01:31
summary: Correct the position of point in some line-up functions.
cc-align.el (c-lineup-whitesmith-in-block, c-lineup-assignments)
(c-lineup-gcc-asm-reg ): take position of point at column 0 rather than
at a random place in the line.
cc-mode.texi (Custom Line-Up): State explicitly that point starts at a
random position in the line being indented.
affected #: 2 files
diff -r 3a2a90216ffe53e1b80d556503b5cd053a42ba71 -r f3461758abf62bd22f7ff3cda68350b83b0b0adb cc-align.el
--- a/cc-align.el
+++ b/cc-align.el
@@ -739,7 +739,7 @@
(setq startpos (c-langelem-pos langelem)))))
(setq startpos (c-langelem-pos langelem)
- endpos (point))
+ endpos (c-point 'bol))
;; Find a syntactically relevant and unnested "=" token on the
;; current line. equalp is in that case set to the number of
@@ -1041,6 +1041,7 @@
arglist-intro, arglist-cont-nonempty, arglist-close, and all in*
symbols, e.g. inclass and inextern-lang."
(save-excursion
+ (beginning-of-line)
(if (and (c-go-up-list-backward)
(= (point) (c-point 'boi)))
nil
@@ -1193,6 +1194,7 @@
(let ((orig-pos (point))
alignto)
(save-excursion
+ (beginning-of-line)
(and
c-opt-asm-stmt-key
diff -r 3a2a90216ffe53e1b80d556503b5cd053a42ba71 -r f3461758abf62bd22f7ff3cda68350b83b0b0adb cc-mode.texi
--- a/cc-mode.texi
+++ b/cc-mode.texi
@@ -6465,13 +6465,14 @@
please contact @email{bug-cc-mode@(a)gnu.org}.
Line-up functions are passed a single argument, the syntactic
-element (see below). The return value is a @code{c-offsets-alist}
-offset specification: for example, an integer, a symbol such as
-@code{+}, a vector, @code{nil}@footnote{Returning @code{nil} is useful
-when the offset specification for a syntactic element is a list
-containing the line-up function (@pxref{c-offsets-alist}).}, or even
-another line-up function. Full details of these are in
-@ref{c-offsets-alist}.
+element (see below). At the time of the call, point will be somewhere
+on the line being indented. The return value is a
+@code{c-offsets-alist} offset specification: for example, an integer,
+a symbol such as @code{+}, a vector, @code{nil}@footnote{Returning
+@code{nil} is useful when the offset specification for a syntactic
+element is a list containing the line-up function
+((a)pxref{c-offsets-alist}).}, or even another line-up function. Full
+details of these are in @ref{c-offsets-alist}.
Line-up functions must not move point or change the content of the
buffer (except temporarily). They are however allowed to do
Repository URL: https://bitbucket.org/xemacs/cc-mode/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[PATCH 21.5] Large file support
11 years, 9 months
Jerry James
Don't get too excited. This isn't *that* large file support. A
recent discussion on the Fedora devel list pointed out that btrfs is
now using 64 bit inode numbers even on 32-bit systems, and so some
stat() calls are failing spuriously (with EOVERFLOW) just because the
inode number cannot be stored in the 32-bit stat structure, even if
the caller is not interested in the inode number.
The attached patch is intended to avoid this problem by building with
_FILE_OFFSET_BITS == 64 when possible, and by recognizing that certain
integer values may overflow a Lisp fixnum. There is only so much that
can be done about the latter problem on a system without bignums, and
this patch doesn't fix all of those problems. However, on 32-bit
systems with bignums, this patch improves the situation.
--
Jerry James
http://www.jamezone.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
Make `declare-f?boundp' less necessary
11 years, 9 months
Michael Sperber
I've been trying to port some more code. (ido.el, coming soon.) This
requires a bunch of fboundp tests, but it's annoying that this spits out
compiler warnings. I can silence them with (declare-fboundp ...), but
this isn't supported on GNU Emacs.
The attached patch makes the byte-code compiler recognize (if (fboundp
...) ...) forms. The corresponding patch from GNU Emacs applied
cleanly.
I realize this may be controversial; let me know if you object. I'll
wait until Tuesday until pushing this.
2013-03-02 Michael Sperber <mike(a)xemacs.org>
* bytecomp.el (byte-compile-if): Port this patch from GNU Emacs:
Author: Dave Love <fx(a)gnu.org>
Date: Thu Dec 12 20:27:43 2002 +0000
(byte-compile-if): Suppress warnings from
things protected by `(if (fboundp ...' or `(if (boundp ...'.
--
Regards,
Mike
diff --git a/lisp/bytecomp.el b/lisp/bytecomp.el
--- a/lisp/bytecomp.el
+++ b/lisp/bytecomp.el
@@ -4160,19 +4160,53 @@
(defun byte-compile-if (form)
(byte-compile-form (car (cdr form)))
- (if (null (nthcdr 3 form))
- ;; No else-forms
- (let ((donetag (byte-compile-make-tag)))
- (byte-compile-goto-if nil for-effect donetag)
- (byte-compile-form (nth 2 form) for-effect)
- (byte-compile-out-tag donetag))
- (let ((donetag (byte-compile-make-tag)) (elsetag (byte-compile-make-tag)))
- (byte-compile-goto 'byte-goto-if-nil elsetag)
- (byte-compile-form (nth 2 form) for-effect)
- (byte-compile-goto 'byte-goto donetag)
- (byte-compile-out-tag elsetag)
- (byte-compile-body (cdr (cdr (cdr form))) for-effect)
- (byte-compile-out-tag donetag)))
+ ;; Check whether we have `(if (fboundp ...' or `(if (boundp ...'
+ ;; and avoid warnings about the relevent symbols in the consequent.
+ (let* ((clause (nth 1 form))
+ (fbound (if (eq 'fboundp (car-safe clause))
+ (and (eq 'quote (car-safe (nth 1 clause)))
+ ;; Ignore if the symbol is already on the
+ ;; unresolved list.
+ (not (assq
+ (nth 1 (nth 1 clause)) ; the relevant symbol
+ byte-compile-unresolved-functions))
+ (nth 1 (nth 1 clause)))))
+ (bound (if (eq 'boundp (car-safe clause))
+ (and (eq 'quote (car-safe (nth 1 clause)))
+ (nth 1 (nth 1 clause)))))
+ (donetag (byte-compile-make-tag)))
+ (if (null (nthcdr 3 form))
+ ;; No else-forms
+ (progn
+ (byte-compile-goto-if nil for-effect donetag)
+ ;; Maybe add to the bound list.
+ (let ((byte-compile-bound-variables
+ (if bound
+ (cons bound byte-compile-bound-variables)
+ byte-compile-bound-variables)))
+ (byte-compile-form (nth 2 form) for-effect))
+ ;; Maybe remove the function symbol from the unresolved list.
+ (if fbound
+ (setq byte-compile-unresolved-functions
+ (delq (assq fbound byte-compile-unresolved-functions)
+ byte-compile-unresolved-functions)))
+ (byte-compile-out-tag donetag))
+ (let ((elsetag (byte-compile-make-tag)))
+ (byte-compile-goto 'byte-goto-if-nil elsetag)
+ ;; As above for the first form.
+ (let ((byte-compile-bound-variables
+ (if bound
+ (cons bound byte-compile-bound-variables)
+ byte-compile-bound-variables)))
+ (byte-compile-form (nth 2 form) for-effect))
+ (if fbound
+ (setq byte-compile-unresolved-functions
+ (delq (assq fbound byte-compile-unresolved-functions)
+ byte-compile-unresolved-functions)))
+ (byte-compile-goto 'byte-goto donetag)
+ (byte-compile-out-tag elsetag)
+ (byte-compile-body (cdr (cdr (cdr form))) for-effect)
+ (byte-compile-out-tag donetag))))
(setq for-effect nil))
(defun byte-compile-cond (clauses)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/XEmacs: 2 new changesets
11 years, 9 months
Bitbucket
2 new commits in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/b3a2bff825c8/
changeset: b3a2bff825c8
user: sperber
date: 2013-03-02 18:00:42
summary: Make f?boundp less necessary.
2013-03-02 Michael Sperber <mike(a)xemacs.org>
* bytecomp.el (byte-compile-if): Port this patch from GNU Emacs:
Author: Dave Love <fx(a)gnu.org>
Date: Thu Dec 12 20:27:43 2002 +0000
(byte-compile-if): Suppress warnings from
things protected by `(if (fboundp ...' or `(if (boundp ...'.
affected #: 2 files
diff -r fffa151380192308e890528ce556f70a19da6e93 -r b3a2bff825c840944f997050fb558cb2d8ed8a43 lisp/ChangeLog
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2013-03-02 Michael Sperber <mike(a)xemacs.org>
+
+ * bytecomp.el (byte-compile-if): Port this patch from GNU Emacs:
+
+ Author: Dave Love <fx(a)gnu.org>
+ Date: Thu Dec 12 20:27:43 2002 +0000
+
+ (byte-compile-if): Suppress warnings from
+ things protected by `(if (fboundp ...' or `(if (boundp ...'.
+
2013-02-20 Michael Sperber <mike(a)xemacs.org>
* files.el (file-remote-p): Remove an ancient piece of obsolete
diff -r fffa151380192308e890528ce556f70a19da6e93 -r b3a2bff825c840944f997050fb558cb2d8ed8a43 lisp/bytecomp.el
--- a/lisp/bytecomp.el
+++ b/lisp/bytecomp.el
@@ -4160,19 +4160,53 @@
(defun byte-compile-if (form)
(byte-compile-form (car (cdr form)))
- (if (null (nthcdr 3 form))
- ;; No else-forms
- (let ((donetag (byte-compile-make-tag)))
- (byte-compile-goto-if nil for-effect donetag)
- (byte-compile-form (nth 2 form) for-effect)
- (byte-compile-out-tag donetag))
- (let ((donetag (byte-compile-make-tag)) (elsetag (byte-compile-make-tag)))
- (byte-compile-goto 'byte-goto-if-nil elsetag)
- (byte-compile-form (nth 2 form) for-effect)
- (byte-compile-goto 'byte-goto donetag)
- (byte-compile-out-tag elsetag)
- (byte-compile-body (cdr (cdr (cdr form))) for-effect)
- (byte-compile-out-tag donetag)))
+ ;; Check whether we have `(if (fboundp ...' or `(if (boundp ...'
+ ;; and avoid warnings about the relevent symbols in the consequent.
+ (let* ((clause (nth 1 form))
+ (fbound (if (eq 'fboundp (car-safe clause))
+ (and (eq 'quote (car-safe (nth 1 clause)))
+ ;; Ignore if the symbol is already on the
+ ;; unresolved list.
+ (not (assq
+ (nth 1 (nth 1 clause)) ; the relevant symbol
+ byte-compile-unresolved-functions))
+ (nth 1 (nth 1 clause)))))
+ (bound (if (eq 'boundp (car-safe clause))
+ (and (eq 'quote (car-safe (nth 1 clause)))
+ (nth 1 (nth 1 clause)))))
+ (donetag (byte-compile-make-tag)))
+ (if (null (nthcdr 3 form))
+ ;; No else-forms
+ (progn
+ (byte-compile-goto-if nil for-effect donetag)
+ ;; Maybe add to the bound list.
+ (let ((byte-compile-bound-variables
+ (if bound
+ (cons bound byte-compile-bound-variables)
+ byte-compile-bound-variables)))
+ (byte-compile-form (nth 2 form) for-effect))
+ ;; Maybe remove the function symbol from the unresolved list.
+ (if fbound
+ (setq byte-compile-unresolved-functions
+ (delq (assq fbound byte-compile-unresolved-functions)
+ byte-compile-unresolved-functions)))
+ (byte-compile-out-tag donetag))
+ (let ((elsetag (byte-compile-make-tag)))
+ (byte-compile-goto 'byte-goto-if-nil elsetag)
+ ;; As above for the first form.
+ (let ((byte-compile-bound-variables
+ (if bound
+ (cons bound byte-compile-bound-variables)
+ byte-compile-bound-variables)))
+ (byte-compile-form (nth 2 form) for-effect))
+ (if fbound
+ (setq byte-compile-unresolved-functions
+ (delq (assq fbound byte-compile-unresolved-functions)
+ byte-compile-unresolved-functions)))
+ (byte-compile-goto 'byte-goto donetag)
+ (byte-compile-out-tag elsetag)
+ (byte-compile-body (cdr (cdr (cdr form))) for-effect)
+ (byte-compile-out-tag donetag))))
(setq for-effect nil))
(defun byte-compile-cond (clauses)
https://bitbucket.org/xemacs/xemacs/commits/179f4a9201b5/
changeset: 179f4a9201b5
user: sperber
date: 2013-03-05 08:55:56
summary: Merge.
affected #: 5 files
diff -r b3a2bff825c840944f997050fb558cb2d8ed8a43 -r 179f4a9201b5e056371ea83f50879a2384d69157 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-03-04 Jerry James <james(a)xemacs.org>
+
+ * configure.ac: Complete removal of need_modules_common, forgotten
+ in the previous patch.
+
+2013-03-02 Jerry James <james(a)xemacs.org>
+
+ * configure.ac: Make symbolic links in src for module source files
+ if they are built into the executable, so they are built with the
+ same CFLAGS as the non-module source files.
+
2013-01-04 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.33 "horseradish" is released.
diff -r b3a2bff825c840944f997050fb558cb2d8ed8a43 -r 179f4a9201b5e056371ea83f50879a2384d69157 configure
--- a/configure
+++ b/configure
@@ -15216,10 +15216,14 @@
done
LIBS="$save_LIBS"
- MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi
- need_modules_common=yes
if test "$with_modules" = "yes"; then
+ MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi
INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ else
+ mkdir src
+ for fil in eldap.c eldap.h; do
+ ${LN_S} "$srcdir/modules/ldap/$fil" "src/$fil"
+ done
fi
fi
@@ -15388,10 +15392,14 @@
_ACEOF
postgresql_libs="$pq_libs $postgresql_libs" && if test "$verbose" = "yes"; then echo " Prepending \"$pq_libs\" to \$postgresql_libs"; fi
- MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi
- need_modules_common=yes
if test "$with_modules" = "yes"; then
+ MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi
INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ else
+ mkdir src
+ for fil in postgresql.c postgresql.h; do
+ ${LN_S} "$srcdir/modules/postgresql/$fil" "src/$fil"
+ done
fi
elif test "$with_postgresql" = "yes"; then
{ echo "Error:" "Required PostgreSQL support cannot be provided. Check --with-site-prefixes." >&2; exit 1; }
@@ -17431,10 +17439,12 @@
test -n "$canna_wchar_aware" && $as_echo "#define CANNA_NEW_WCHAR_AWARE 1" >>confdefs.h
- MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$MAKE_SUBDIR"; fi
- need_modules_common=yes
if test "$with_modules" = "yes"; then
+ MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$MAKE_SUBDIR"; fi
INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ else
+ mkdir src
+ ${LN_S} "$srcdir/modules/canna/canna_api.c" "src/canna_api.c"
fi
canna_libs="-lcanna -lRKC $canna_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$canna_libs"; fi
elif test "$with_canna" != "no"; then
@@ -20727,7 +20737,7 @@
fi
done
-if test "$need_modules_common" = "yes"; then
+if test "$with_modules" = "yes"; then
for dir in modules/common; do
if test ! -d "$dir" ; then
echo Making symbolic link to "$srcdir/$dir"
diff -r b3a2bff825c840944f997050fb558cb2d8ed8a43 -r 179f4a9201b5e056371ea83f50879a2384d69157 configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3613,10 +3613,14 @@
save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs"
AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result)
LIBS="$save_LIBS"
- XE_APPEND(modules/ldap, MAKE_SUBDIR)
- need_modules_common=yes
if test "$with_modules" = "yes"; then
+ XE_APPEND(modules/ldap, MAKE_SUBDIR)
XE_APPEND(modules/ldap, INSTALL_ARCH_DEP_SUBDIR)
+ else
+ mkdir src
+ for fil in eldap.c eldap.h; do
+ ${LN_S} "$srcdir/modules/ldap/$fil" "src/$fil"
+ done
fi
fi
AC_SUBST(ldap_libs)
@@ -3664,10 +3668,14 @@
AC_DEFINE(HAVE_POSTGRESQLV7)], [:], $extra_libs)
AC_DEFINE_UNQUOTED(LIBPQ_FE_H_FILE, "$libpq_fe_h_file")
XE_PREPEND([$pq_libs], postgresql_libs)
- XE_APPEND(modules/postgresql, MAKE_SUBDIR)
- need_modules_common=yes
if test "$with_modules" = "yes"; then
+ XE_APPEND(modules/postgresql, MAKE_SUBDIR)
XE_APPEND(modules/postgresql, INSTALL_ARCH_DEP_SUBDIR)
+ else
+ mkdir src
+ for fil in postgresql.c postgresql.h; do
+ ${LN_S} "$srcdir/modules/postgresql/$fil" "src/$fil"
+ done
fi
elif test "$with_postgresql" = "yes"; then
XE_DIE("Required PostgreSQL support cannot be provided. Check --with-site-prefixes.")
@@ -4340,10 +4348,12 @@
if test "$have_canna" = "yes"; then
AC_DEFINE(HAVE_CANNA)
test -n "$canna_wchar_aware" && AC_DEFINE(CANNA_NEW_WCHAR_AWARE)
- XE_APPEND(modules/canna, MAKE_SUBDIR)
- need_modules_common=yes
if test "$with_modules" = "yes"; then
+ XE_APPEND(modules/canna, MAKE_SUBDIR)
XE_APPEND(modules/canna, INSTALL_ARCH_DEP_SUBDIR)
+ else
+ mkdir src
+ ${LN_S} "$srcdir/modules/canna/canna_api.c" "src/canna_api.c"
fi
XE_PREPEND(-lcanna -lRKC, canna_libs)
elif test "$with_canna" != "no"; then
@@ -5359,7 +5369,7 @@
done
dnl Also make modules/common link if needed for the module Makefiles.
-if test "$need_modules_common" = "yes"; then
+if test "$with_modules" = "yes"; then
for dir in modules/common; do
if test ! -d "$dir" ; then
echo Making symbolic link to "$srcdir/$dir"
diff -r b3a2bff825c840944f997050fb558cb2d8ed8a43 -r 179f4a9201b5e056371ea83f50879a2384d69157 src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-02 Jerry James <james(a)xemacs.org>
+
+ * Makefile.in.in: If modules are built into the executable, assume
+ that module source files are available in the current directory,
+ since configure now creates soft links for them.
+
2013-02-22 Michael Sperber <mike(a)xemacs.org>
* event-stream.c (post_command_hook): Don't complain about throws
diff -r b3a2bff825c840944f997050fb558cb2d8ed8a43 -r 179f4a9201b5e056371ea83f50879a2384d69157 src/Makefile.in.in
--- a/src/Makefile.in.in
+++ b/src/Makefile.in.in
@@ -192,7 +192,7 @@
#endif
#if defined(HAVE_LDAP) && !defined(HAVE_SHLIB)
-ldap_objs=$(BLDMODULES)/ldap/eldap.o
+ldap_objs=eldap.o
#endif
#ifdef MULE
@@ -200,7 +200,7 @@
#endif
#if defined(HAVE_CANNA) && !defined(HAVE_SHLIB)
-mule_canna_objs=$(BLDMODULES)/canna/canna_api.o
+mule_canna_objs=canna_api.o
#endif
#ifdef HAVE_WNN
@@ -215,7 +215,7 @@
#endif
#if defined(HAVE_POSTGRESQL) && !defined(HAVE_SHLIB)
-postgresql_objs=$(BLDMODULES)/postgresql/postgresql.o
+postgresql_objs=postgresql.o
#endif
#ifdef HAVE_WIN32_PROCESSES
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/cc-mode: 2 new changesets
11 years, 9 months
Bitbucket
2 new commits in cc-mode:
https://bitbucket.org/xemacs/cc-mode/commits/3588e63d2bb9/
changeset: 3588e63d2bb9
user: acm
date: 2013-03-04 19:30:30
summary: Replace `last-command-event' by `last-command-char' in XEmacs.
cc-defs.el (c-last-command-char): New macro.
cc-align.el (c-semi&comma-inside-parenlist)
(c-semi&comma-no-newlines-before-nonblanks)
(c-semi&comma-no-newlines-for-oneline-inliners): Use the new macro in
place of `last-command-event'.
cc-cmds.el (c-electric-pound, c-electric-brace, c-electric-slash)
(c-electric-semi&comma, c-electric-lt-gt, c-electric-paren)
(c-electric-continued-statement): Use the new macro in place of
`last-command-event'.
affected #: 3 files
diff -r 46a489fd8658e00feee07abcdf12e8e0c2132994 -r 3588e63d2bb91225166a37e2f90af1230aa0d4fb cc-align.el
--- a/cc-align.el
+++ b/cc-align.el
@@ -1298,7 +1298,7 @@
exactly the old newline insertion behavior."
;; newline only after semicolon, but only if that semicolon is not
;; inside a parenthesis list (e.g. a for loop statement)
- (if (not (eq last-command-event ?\;))
+ (if (not (eq (c-last-command-char) ?\;))
nil ; continue checking
(if (condition-case nil
(save-excursion
@@ -1315,7 +1315,7 @@
inserted, and the following line is not blank, no newline is inserted.
Otherwise, no determination is made."
(save-excursion
- (if (and (= last-command-event ?\;)
+ (if (and (= (c-last-command-char) ?\;)
;;(/= (point-max)
;; (save-excursion (skip-syntax-forward " ") (point))
(zerop (forward-line 1))
@@ -1335,7 +1335,7 @@
(if (c-safe (up-list -1) t)
(c-point 'bol)
-1))))
- (if (and (eq last-command-event ?\;)
+ (if (and (eq (c-last-command-char) ?\;)
(eq (car (car syntax)) 'inclass)
(eq (car (car (cdr syntax))) 'topmost-intro)
(= (c-point 'bol) bol))
diff -r 46a489fd8658e00feee07abcdf12e8e0c2132994 -r 3588e63d2bb91225166a37e2f90af1230aa0d4fb cc-cmds.el
--- a/cc-cmds.el
+++ b/cc-cmds.el
@@ -477,7 +477,7 @@
(bolp (bolp)))
(beginning-of-line)
(delete-horizontal-space)
- (insert last-command-event)
+ (insert (c-last-command-char))
(and (not bolp)
(goto-char (- (point-max) pos)))
)))
@@ -739,7 +739,7 @@
;; `}': clean up empty defun braces
(when (c-save-buffer-state ()
(and (memq 'empty-defun-braces c-cleanup-list)
- (eq last-command-event ?\})
+ (eq (c-last-command-char) ?\})
(c-intersect-lists '(defun-close class-close inline-close)
syntax)
(progn
@@ -755,14 +755,14 @@
;; `}': compact to a one-liner defun?
(save-match-data
(when
- (and (eq last-command-event ?\})
+ (and (eq (c-last-command-char) ?\})
(memq 'one-liner-defun c-cleanup-list)
(c-intersect-lists '(defun-close) syntax)
(c-try-one-liner))
(setq here (- (point-max) pos))))
;; `{': clean up brace-else-brace and brace-elseif-brace
- (when (eq last-command-event ?\{)
+ (when (eq (c-last-command-char) ?\{)
(cond
((and (memq 'brace-else-brace c-cleanup-list)
(re-search-backward
@@ -816,7 +816,7 @@
))))
;; blink the paren
- (and (eq last-command-event ?\})
+ (and (eq (c-last-command-char) ?\})
(not executing-kbd-macro)
old-blink-paren
(save-excursion
@@ -853,7 +853,7 @@
(when (and (not arg)
(eq literal 'c)
(memq 'comment-close-slash c-cleanup-list)
- (eq last-command-event ?/)
+ (eq (c-last-command-char) ?/)
(looking-at (concat "[ \t]*\\("
(regexp-quote comment-end) "\\)?$"))
; (eq c-block-comment-ender "*/") ; C-style comments ALWAYS end in */
@@ -869,7 +869,7 @@
(setq indentp (and (not arg)
c-syntactic-indentation
c-electric-flag
- (eq last-command-event ?/)
+ (eq (c-last-command-char) ?/)
(eq (char-before) (if literal ?* ?/))))
(self-insert-command (prefix-numeric-value arg))
(if indentp
@@ -950,10 +950,10 @@
(let ((pos (- (point-max) (point))))
(if (c-save-buffer-state ()
(and (or (and
- (eq last-command-event ?,)
+ (eq (c-last-command-char) ?,)
(memq 'list-close-comma c-cleanup-list))
(and
- (eq last-command-event ?\;)
+ (eq (c-last-command-char) ?\;)
(memq 'defun-close-semi c-cleanup-list)))
(progn
(forward-char -1)
@@ -1110,7 +1110,7 @@
;; Indent the line if appropriate.
(when (and c-electric-flag c-syntactic-indentation c-recognize-<>-arglists)
(setq found-delim
- (if (eq last-command-event ?<)
+ (if (eq (c-last-command-char) ?<)
;; If a <, basically see if it's got "template" before it .....
(or (and (progn
(backward-char)
@@ -1204,7 +1204,7 @@
;; clean up brace-elseif-brace
(when
(and (memq 'brace-elseif-brace c-cleanup-list)
- (eq last-command-event ?\()
+ (eq (c-last-command-char) ?\()
(re-search-backward
(concat "}"
"\\([ \t\n]\\|\\\\\n\\)*"
@@ -1222,7 +1222,7 @@
;; clean up brace-catch-brace
(when
(and (memq 'brace-catch-brace c-cleanup-list)
- (eq last-command-event ?\()
+ (eq (c-last-command-char) ?\()
(re-search-backward
(concat "}"
"\\([ \t\n]\\|\\\\\n\\)*"
@@ -1243,7 +1243,7 @@
;; space-before-funcall clean-up?
((and (memq 'space-before-funcall c-cleanup-list)
- (eq last-command-event ?\()
+ (eq (c-last-command-char) ?\()
(save-excursion
(backward-char)
(skip-chars-backward " \t")
@@ -1261,7 +1261,7 @@
;; compact-empty-funcall clean-up?
((c-save-buffer-state ()
(and (memq 'compact-empty-funcall c-cleanup-list)
- (eq last-command-event ?\))
+ (eq (c-last-command-char) ?\))
(save-excursion
(c-safe (backward-char 2))
(when (looking-at "()")
@@ -1290,7 +1290,7 @@
(when (c-save-buffer-state ()
(and c-electric-flag
c-syntactic-indentation
- (not (eq last-command-event ?_))
+ (not (eq (c-last-command-char) ?_))
(= (save-excursion
(skip-syntax-backward "w")
(point))
diff -r 46a489fd8658e00feee07abcdf12e8e0c2132994 -r 3588e63d2bb91225166a37e2f90af1230aa0d4fb cc-defs.el
--- a/cc-defs.el
+++ b/cc-defs.el
@@ -391,6 +391,13 @@
`(int-to-char ,integer)
integer))
+(defmacro c-last-command-char ()
+ ;; The last character just typed. Note that `last-command-event' exists in
+ ;; both Emacs and XEmacs, but with confusingly different meanings.
+ (if (featurep 'xemacs)
+ 'last-command-char
+ 'last-command-event))
+
(defmacro c-sentence-end ()
;; Get the regular expression `sentence-end'.
(if (cc-bytecomp-fboundp 'sentence-end)
https://bitbucket.org/xemacs/cc-mode/commits/3a2a90216ffe/
changeset: 3a2a90216ffe
user: acm
date: 2013-03-04 19:43:34
summary: Merge.
affected #: 3 files
diff -r 3588e63d2bb91225166a37e2f90af1230aa0d4fb -r 3a2a90216ffe53e1b80d556503b5cd053a42ba71 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -93,3 +93,5 @@
46f8e9f7f8174bdf529daf1577892b212c566d5b cc-mode-1_58
c325532f7d0bbf9c4cae63da83d12abf2033c6b5 cc-mode-1_59
84035315a6ee61c74a5ebd43dab790318c1cc9a3 cc-mode-1_60
+193c0f9dbfbac71e083f2974efc724a82d1106c5 cc-mode-1_62
+b855e452c23959bb9efcd397f3739ba11ad97718 cc-mode-1_63
diff -r 3588e63d2bb91225166a37e2f90af1230aa0d4fb -r 3a2a90216ffe53e1b80d556503b5cd053a42ba71 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2013-02-08 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.63 released.
+
+2013-02-08 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.62 released.
+
+2013-02-08 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.62 released.
+
+2013-02-08 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.62 released.
+
+2013-02-08 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.62 released.
+
2013-01-27 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.60 released.
diff -r 3588e63d2bb91225166a37e2f90af1230aa0d4fb -r 3a2a90216ffe53e1b80d556503b5cd053a42ba71 Makefile
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.60
+VERSION = 1.63
AUTHOR_VERSION = 5.32.2
MAINTAINER = Alan Mackenzie <bug-cc-mode(a)gnu.org>
PACKAGE = cc-mode
Repository URL: https://bitbucket.org/xemacs/cc-mode/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches