Commit ba93a187 authored by Paul Eggert's avatar Paul Eggert

Remove obsolete '#define static' cruft.

* etc/PROBLEMS: Remove obsolete '#define static' cruft.
* lwlib/xlwmenu.c [emacs]: Include "bitmaps/gray.xbm".
(gray_bitmap_width, gray_bitmap_height, gray_bitmap_bits) [!emacs]:
Remove; all uses replaced with definiens.
* src/s/hpux10-20.h (_FILE_OFFSET_BITS): Don't #undef.
This #undef was "temporary" in 2000; it is no longer needed
now that '#define static' has gone away.
* src/xfns.c, src/xterm.h (gray_bitmap_width, gray_bitmap_height)
(gray_bitmap_bits): Remove; no longer needed.
All uses replaced with definiens.
* src/xterm.c: Include "bitmaps/gray.xbm".
parent 500fcedc
2012-05-31 Paul Eggert <eggert@cs.ucla.edu>
* PROBLEMS: Remove obsolete '#define static' cruft.
2012-05-07 Glenn Morris <rgm@gnu.org>
* forms/forms-d2.el, forms/forms-pass.el: Move here from ../lisp.
......
......@@ -2778,19 +2778,11 @@ build Emacs in a directory on a local disk.
*** The dumped Emacs crashes when run, trying to write pure data.
Two causes have been seen for such problems.
1) On a system where getpagesize is not a system call, it is defined
On a system where getpagesize is not a system call, it is defined
as a macro. If the definition (in both unex*.c and malloc.c) is wrong,
it can cause problems like this. You might be able to find the correct
value in the man page for a.out (5).
2) Some systems allocate variables declared static among the
initialized variables. Emacs makes all initialized variables in most
of its files pure after dumping, but the variables declared static and
not initialized are not supposed to be pure. On these systems you
may need to add "#define static" to config.h.
* Runtime problems on legacy systems
This section covers bugs reported on very old hardware or software.
......
2012-05-31 Paul Eggert <eggert@cs.ucla.edu>
Remove obsolete '#define static' cruft.
* xlwmenu.c [emacs]: Include "bitmaps/gray.xbm".
(gray_bitmap_width, gray_bitmap_height, gray_bitmap_bits) [!emacs]:
Remove; all uses replaced with definiens.
2012-04-18 Paul Eggert <eggert@cs.ucla.edu>
configure: new option --enable-gcc-warnings (Bug#11207)
......
......@@ -49,22 +49,12 @@ Boston, MA 02110-1301, USA. */
#ifdef emacs
/* Defined in xfns.c. When config.h defines `static' as empty, we get
redefinition errors when gray_bitmap is included more than once, so
we're referring to the one include in xfns.c here. */
extern int gray_bitmap_width;
extern int gray_bitmap_height;
extern char *gray_bitmap_bits;
#include <xterm.h>
#include "bitmaps/gray.xbm"
#else /* not emacs */
#include <X11/bitmaps/gray>
#define gray_bitmap_width gray_width
#define gray_bitmap_height gray_height
#define gray_bitmap_bits gray_bits
#endif /* not emacs */
......@@ -1918,8 +1908,8 @@ XlwMenuInitialize (Widget request, Widget w, ArgList args, Cardinal *num_args)
mw->menu.cursor = mw->menu.cursor_shape;
mw->menu.gray_pixmap
= XCreatePixmapFromBitmapData (display, window, gray_bitmap_bits,
gray_bitmap_width, gray_bitmap_height,
= XCreatePixmapFromBitmapData (display, window, gray_bits,
gray_width, gray_height,
(unsigned long)1, (unsigned long)0, 1);
#ifdef HAVE_XFT
......
2012-05-31 Paul Eggert <eggert@cs.ucla.edu>
Remove obsolete '#define static' cruft.
* s/hpux10-20.h (_FILE_OFFSET_BITS): Don't #undef.
This #undef was "temporary" in 2000; it is no longer needed
now that '#define static' has gone away.
* xfns.c, xterm.h (gray_bitmap_width, gray_bitmap_height)
(gray_bitmap_bits): Remove; no longer needed.
All uses replaced with definiens.
* xterm.c: Include "bitmaps/gray.xbm".
2012-05-30 Paul Eggert <eggert@cs.ucla.edu>
Clean up __executable_start, monstartup when --enable-profiling.
......
......@@ -95,12 +95,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define HAVE_XRMSETDATABASE
#endif
/* 2000-11-21: Temporarily disable Unix 98 large file support found by
configure. It fails on HPUX 11, at least, because it enables
header sections which lose when `static' is defined away, as it is
on HP-UX. (You get duplicate symbol errors on linking). */
#undef _FILE_OFFSET_BITS
/* Conservative garbage collection has not been tested, so for now
play it safe and stick with the old-fashioned way of marking. */
#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
......
......@@ -126,14 +126,6 @@ extern LWLIB_ID widget_id_tick;
#define MAXREQUEST(dpy) (XMaxRequestSize (dpy))
/* The gray bitmap `bitmaps/gray'. This is done because xterm.c uses
it, and including `bitmaps/gray' more than once is a problem when
config.h defines `static' as an empty replacement string. */
int gray_bitmap_width = gray_width;
int gray_bitmap_height = gray_height;
char *gray_bitmap_bits = gray_bits;
/* Nonzero if using X. */
int x_in_use;
......
......@@ -139,6 +139,8 @@ extern void _XEditResCheckMessages (Widget, XtPointer, XEvent *, Boolean *);
#endif
#endif
#include "bitmaps/gray.xbm"
/* Default to using XIM if available. */
#ifdef USE_XIM
int use_xim = 1;
......@@ -10383,8 +10385,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
{
dpyinfo->gray
= XCreatePixmapFromBitmapData (dpyinfo->display, dpyinfo->root_window,
gray_bitmap_bits,
gray_bitmap_width, gray_bitmap_height,
gray_bits, gray_width, gray_height,
1, 0, 1);
}
......
......@@ -939,8 +939,6 @@ void x_handle_property_notify (XPropertyEvent *);
struct frame *check_x_frame (Lisp_Object);
EXFUN (Fx_display_grayscale_p, 1);
extern void x_free_gcs (struct frame *);
extern int gray_bitmap_width, gray_bitmap_height;
extern char *gray_bitmap_bits;
/* From xrdb.c. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment