diff --git a/src/alloc.c b/src/alloc.c index 90f913da36..6f81195cc3 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -378,7 +378,6 @@ inline static bool vector_marked_p (const struct Lisp_Vector *v); inline static void set_vector_marked (struct Lisp_Vector *v); inline static bool vectorlike_marked_p (const union vectorlike_header *v); -inline static void set_vectorlike_marked (union vectorlike_header *v); inline static bool cons_marked_p (const struct Lisp_Cons *c); inline static void set_cons_marked (struct Lisp_Cons *c); @@ -393,7 +392,6 @@ inline static bool misc_any_marked_p (const struct Lisp_Misc_Any *m); inline static void set_misc_any_marked (struct Lisp_Misc_Any *m); inline static bool marker_marked_p (const struct Lisp_Marker *m); -inline static void set_marker_marked (struct Lisp_Marker *m); inline static bool overlay_marked_p (const struct Lisp_Overlay *m); inline static void set_overlay_marked (struct Lisp_Overlay *m); @@ -4150,12 +4148,6 @@ vectorlike_marked_p (const union vectorlike_header *header) return vector_marked_p ((const struct Lisp_Vector *) header); } -static void -set_vectorlike_marked (union vectorlike_header *header) -{ - set_vector_marked ((struct Lisp_Vector *) header); -} - static bool cons_marked_p (const struct Lisp_Cons *c) { @@ -4230,12 +4222,6 @@ marker_marked_p (const struct Lisp_Marker *m) return misc_any_marked_p ((struct Lisp_Misc_Any *) m); } -static void -set_marker_marked (struct Lisp_Marker *m) -{ - set_misc_any_marked ((struct Lisp_Misc_Any *) m); -} - static bool overlay_marked_p (const struct Lisp_Overlay *m) { diff --git a/src/macfont.m b/src/macfont.m index 377fc3fa48..2cbe07d751 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -1646,7 +1646,7 @@ static int macfont_variation_glyphs (struct font *, int c, unsigned variations[256]); static void macfont_filter_properties (Lisp_Object, Lisp_Object); -static struct font_driver const macfont_driver = +static struct font_driver macfont_driver = { .type = LISPSYM_INITIALLY (Qmac_ct), .get_cache = macfont_get_cache, @@ -4034,6 +4034,8 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no +static void syms_of_macfont_for_pdumper (void); + void syms_of_macfont (void) { diff --git a/src/nsfns.m b/src/nsfns.m index 8911ad27fe..c2ee4df33f 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -3196,12 +3196,6 @@ - (NSString *)panel: (id)sender userEnteredFilename: (NSString *)filename ========================================================================== */ -static void -syms_of_nsfns_1 (void) -{ - -} - void syms_of_nsfns (void) { diff --git a/src/pdumper.c b/src/pdumper.c index 499c8dc27c..7053e52ad6 100644 --- a/src/pdumper.c +++ b/src/pdumper.c @@ -2917,7 +2917,7 @@ dump_object_1 (struct dump_context *ctx, Lisp_Object object) offset = dump_float (ctx, XFLOAT (object)); break; case_Lisp_Int: - eassert (("should not be dumping int: is self-representing", 0)); + eassert ("should not be dumping int: is self-representing" && false); default: emacs_abort (); }