summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gramiak <agrambot@gmail.com>2019-04-17 08:04:46 -0600
committerAlexander Gramiak <agrambot@gmail.com>2019-04-17 08:04:46 -0600
commitbf8fff033a91ae7e74ae019d193111995c8ef7c7 (patch)
treeea2e9b0abcf88f06f478fb3be47bb1988c559b1e
parentdce6d4f982e50e868d6c1b02a73c1f509a00caa5 (diff)
downloademacs-bf8fff033a91ae7e74ae019d193111995c8ef7c7.tar.gz
fixup! Rename non-X x_* identifiers
-rw-r--r--src/nsimage.m2
-rw-r--r--src/nsterm.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nsimage.m b/src/nsimage.m
index f16910de088..33236c48d42 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -193,7 +193,7 @@ ns_set_alpha (void *img, int x, int y, unsigned char a)
EmacsImage *image;
/* Search bitmap-file-path for the file, if appropriate. */
- found = x_find_image_file (file);
+ found = image_find_image_file (file);
if (!STRINGP (found))
return nil;
found = ENCODE_FILE (found);
diff --git a/src/nsterm.h b/src/nsterm.h
index fb683a62921..683f2dd9341 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -1143,7 +1143,7 @@ ns_defined_color (struct frame *f,
XColor *color_def, bool alloc,
bool makeIndex);
extern void
-ns_query_color (void *col, XColor *color_def, int setPixel);
+ns_query_color (void *col, XColor *color_def, bool setPixel);
#ifdef __OBJC__
extern int ns_lisp_to_color (Lisp_Object color, NSColor **col);