diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-05-30 22:08:37 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-05-30 22:08:37 -0700 |
| commit | ba93a18774352c97d6dd73c73141cbff6305581b (patch) | |
| tree | b53eed3c4caf927d4099fcddc1c97d286dfd13e5 /lwlib | |
| parent | 500fcedc32199750ee61ce6caba3914fe204e629 (diff) | |
| download | emacs-ba93a18774352c97d6dd73c73141cbff6305581b.tar.gz emacs-ba93a18774352c97d6dd73c73141cbff6305581b.tar.bz2 emacs-ba93a18774352c97d6dd73c73141cbff6305581b.zip | |
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".
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 7 | ||||
| -rw-r--r-- | lwlib/xlwmenu.c | 16 |
2 files changed, 10 insertions, 13 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 5451fa38001..558b9960213 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,10 @@ +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) diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 0a328f09f1e..4406c505392 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -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 |