# HG changeset patch # User Stephen J. Turnbull # Date 1257951611 -32400 # Node ID ff037e1dc33cb63dfe2577213b451a8bd37e9621 # Parent 679041362cd4dc2465923695708935d0991fce98# Parent dce479915b747e9ec8e2b1ee5ede2658d2c3e2c3 automatic merge diff -r 679041362cd4 -r ff037e1dc33c modules/ChangeLog --- a/modules/ChangeLog Wed Nov 11 23:52:58 2009 +0900 +++ b/modules/ChangeLog Thu Nov 12 00:00:11 2009 +0900 @@ -1,3 +1,10 @@ +2009-11-09 Jerry James + + * sample/external/Makefile.in.in: Clarify GPL status. + * sample/external/configure.ac: Ditto. + * sample/external/sample.c: Ditto. + * sample/internal/sample.c: Ditto. + 2009-10-05 Jerry James * ldap/eldap.c (Fldap_search_basic): quiet gcc warnings due to diff -r 679041362cd4 -r ff037e1dc33c modules/sample/external/Makefile.in.in --- a/modules/sample/external/Makefile.in.in Wed Nov 11 23:52:58 2009 +0900 +++ b/modules/sample/external/Makefile.in.in Thu Nov 12 00:00:11 2009 +0900 @@ -1,5 +1,10 @@ ## Makefile for the sample module in XEmacs. ## Copyright (C) 2002 Jerry James. +## +## This sample Makefile is free; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by the +## Free Software Foundation; either version 2, or (at your option) any +## later version. ## This file is not part of XEmacs. diff -r 679041362cd4 -r ff037e1dc33c modules/sample/external/configure.ac --- a/modules/sample/external/configure.ac Wed Nov 11 23:52:58 2009 +0900 +++ b/modules/sample/external/configure.ac Thu Nov 12 00:00:11 2009 +0900 @@ -1,4 +1,8 @@ # Process this file with autoconf to produce a configure script. +# This sample autoconf input script is free; you can redistribute it and/or +# modify it under the terms of the GNU General Public LIcense as published by +# the Free Software Foundation; either version 2, or (at your option) any +# later version. AC_INIT([Sample module], [1.0], [xemacs-beta@xemacs.org]) AC_PREREQ(2.53) AC_REVISION($Revision: 1.1 $) diff -r 679041362cd4 -r ff037e1dc33c modules/sample/external/sample.c --- a/modules/sample/external/sample.c Wed Nov 11 23:52:58 2009 +0900 +++ b/modules/sample/external/sample.c Thu Nov 12 00:00:11 2009 +0900 @@ -3,6 +3,11 @@ * of Emacs dynamic modules. * (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved. * (C) Copyright 2002 Jerry James. + * + * This sample module code is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your option) + * any later version. */ #include diff -r 679041362cd4 -r ff037e1dc33c modules/sample/internal/sample.c --- a/modules/sample/internal/sample.c Wed Nov 11 23:52:58 2009 +0900 +++ b/modules/sample/internal/sample.c Thu Nov 12 00:00:11 2009 +0900 @@ -3,6 +3,11 @@ * of Emacs dynamic modules. * (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved. * (C) Copyright 2002 Jerry James. + * + * This sample module code is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your option) + * any later version. */ #include diff -r 679041362cd4 -r ff037e1dc33c src/ChangeLog --- a/src/ChangeLog Wed Nov 11 23:52:58 2009 +0900 +++ b/src/ChangeLog Thu Nov 12 00:00:11 2009 +0900 @@ -1,9 +1,21 @@ 2009-11-11 Stephen Turnbull * darwin.h: Remove. Functionality implemented in configure.ac. - * config.h.in (USE_PARAM_H): New. Used by Darwin to #define BSD. +2009-11-09 Aidan Kehoe + + * sysfile.h (DEFAULT_DIRECTORY_FALLBACK): + Move the WIN32_NATIVE definition inside the #ifdef emacs + conditional, clear up the comment after #else; thanks for the + build failure report, Vin! + Cast DEFAULT_DIRECTORY_FALLBACK to (const CIbyte *) by default, + which better reflects its contents. + * editfns.c (get_home_directory): + * buffer.c (init_initial_directory): + Cast DEFAULT_DIRECTORY_FALLBACK to (Ibyte *) with functions that + take that type, now that is necessary. + 2009-11-09 Jerry James * Makefile.in.in: Remove support for malloc.c ("old" GNU malloc). Do diff -r 679041362cd4 -r ff037e1dc33c src/buffer.c --- a/src/buffer.c Wed Nov 11 23:52:58 2009 +0900 +++ b/src/buffer.c Thu Nov 12 00:00:11 2009 +0900 @@ -2929,7 +2929,7 @@ stderr_out ("`getcwd' failed: %s: changing default directory to %s\n", errmess, DEFAULT_DIRECTORY_FALLBACK); - if (qxe_chdir (DEFAULT_DIRECTORY_FALLBACK) < 0) + if (qxe_chdir ((Ibyte *)DEFAULT_DIRECTORY_FALLBACK) < 0) { GET_STRERROR (errmess, errno); diff -r 679041362cd4 -r ff037e1dc33c src/editfns.c --- a/src/editfns.c Wed Nov 11 23:52:58 2009 +0900 +++ b/src/editfns.c Thu Nov 12 00:00:11 2009 +0900 @@ -868,7 +868,8 @@ Using "/" isn't quite right, but what should we do? We probably should try to extract pw_dir from /etc/passwd, before falling back to this. */ - cached_home_directory = qxestrdup (DEFAULT_DIRECTORY_FALLBACK); + cached_home_directory + = qxestrdup ((const Ibyte *)DEFAULT_DIRECTORY_FALLBACK); output_home_warning = 1; } } diff -r 679041362cd4 -r ff037e1dc33c src/sysfile.h --- a/src/sysfile.h Wed Nov 11 23:52:58 2009 +0900 +++ b/src/sysfile.h Thu Nov 12 00:00:11 2009 +0900 @@ -485,13 +485,13 @@ } #define DIRECTORY_SEP sysfile_get_directory_sep() -#else /* emacs */ +#define DEFAULT_DIRECTORY_FALLBACK ((const CIbyte *)"C:\\") + +#else /* not emacs */ /* The above Lisp variables are not available to make-docfile, etc. */ #define DIRECTORY_SEP DEFAULT_DIRECTORY_SEP -#define DEFAULT_DIRECTORY_FALLBACK ((Ibyte *)"C:\\") - #endif /* emacs */ #else /* not WIN32_NATIVE */ @@ -499,7 +499,7 @@ #define SEPCHAR ':' #define DEFAULT_DIRECTORY_SEP '/' #define DIRECTORY_SEP '/' -#define DEFAULT_DIRECTORY_FALLBACK ((Ibyte *)"/") +#define DEFAULT_DIRECTORY_FALLBACK ((const CIbyte *)"/") #endif /* WIN32_NATIVE */