procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert #if changes

Browse source 
I changed some "#ifdef"s to "#if defined"s by mistake, so I reverted them.

* src/alloc.c: Reverted.
(garbage_collect): Reverted.
* src/emacs.c (main): Reverted.
* src/image.c (xpm_load_image): Reverted.
(image_disable_image): Reverted.
(image_build_heuristic_mask): Reverted.
This commit is contained in:
Yuuki Harano 2021-11-13 16:41:29 +09:00
parent c31d3dacf7
commit 3e20d50fc5
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/alloc.c
View file

@ -96,7 +96,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#include <unistd.h>
#include <fcntl.h>
#if defined(USE_GTK)
#ifdef USE_GTK
# include "gtkutil.h"
#endif
#ifdef WINDOWSNT
@ -6148,7 +6148,7 @@ garbage_collect (void)
mark_pgtkterm();
#endif
#if defined(USE_GTK)
#ifdef USE_GTK
xg_mark_data ();
#endif

2
src/emacs.c
View file

@ -2287,7 +2287,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
#ifdef HAVE_DBUS
init_dbusbind ();
#endif
#if defined(USE_GTK)
#ifdef USE_GTK
#ifndef HAVE_PGTK
init_xterm ();
#endif

12
src/image.c
View file

@ -5088,7 +5088,7 @@ xpm_load_image (struct frame *f,
}
if (!image_create_x_image_and_pixmap (f, img, width, height, 0, &ximg, 0)
#if !defined(HAVE_NS)
#ifndef HAVE_NS
|| !image_create_x_image_and_pixmap (f, img, width, height, 1,
&mask_img, 1)
#endif
@ -5216,7 +5216,7 @@ xpm_load_image (struct frame *f,
PUT_PIXEL (ximg, x, y,
FIXNUMP (color_val) ? XFIXNUM (color_val) : frame_fg);
#if !defined(HAVE_NS)
#ifndef HAVE_NS
PUT_PIXEL (mask_img, x, y,
(!EQ (color_val, Qt) ? PIX_MASK_DRAW
: (have_mask = true, PIX_MASK_RETAIN)));
@ -5237,7 +5237,7 @@ xpm_load_image (struct frame *f,
IMAGE_BACKGROUND (img, f, ximg);
image_put_x_image (f, img, ximg, 0);
#if !defined(HAVE_NS)
#ifndef HAVE_NS
if (have_mask)
{
/* Fill in the background_transparent field while we have the
@ -5968,7 +5968,7 @@ image_disable_image (struct frame *f, struct image *img)
if (n_planes < 2 || cross_disabled_images)
{
#ifndef HAVE_NTGUI
#if !defined(HAVE_NS) /* TODO: NS support, however this not needed for toolbars */
#ifndef HAVE_NS /* TODO: NS support, however this not needed for toolbars */
#ifndef USE_CAIRO
#define CrossForeground(f) BLACK_PIX_DEFAULT (f)
@ -6046,7 +6046,7 @@ image_build_heuristic_mask (struct frame *f, struct image *img,
image_clear_image_1 (f, img, CLEAR_IMAGE_MASK);
#ifndef HAVE_NTGUI
#if !defined HAVE_NS
#ifndef HAVE_NS
/* Create an image and pixmap serving as mask. */
if (! image_create_x_image_and_pixmap (f, img, img->width, img->height, 1,
&mask_img, 1))
@ -6108,7 +6108,7 @@ image_build_heuristic_mask (struct frame *f, struct image *img,
if (XGetPixel (ximg, x, y) == bg)
ns_set_alpha (ximg, x, y, 0);
#endif /* HAVE_NS */
#if !defined HAVE_NS
#ifndef HAVE_NS
/* Fill in the background_transparent field while we have the mask handy. */
image_background_transparent (img, f, mask_img);