search

masm11 / emacs

Mirror of GNU Emacs
http://www.gnu.org/software/emacs/
GNU General Public License v3.0
198 stars 14 forks source link

PGTK Remove references to X'ism Xrdb, aligning with the ns-port #22

Closed fejfighter closed 4 years ago

fejfighter commented 4 years ago

src/pgtkterm.h: Change rdb to Lisp_Object (remove XrmDatabase), fix signature src/pgtkterm.c: Do not mark rdb, it's never allocated. src/pgtkfns.c: Update pgtk_get_string_resource signature

masm11 commented 4 years ago

Thanks, but my compiler says:

pgtkterm.c: In function 'pgtk_create_terminal':
pgtkterm.c:4618:38: warning: assignment to 'const char * (*)(void *, const char *, const char *)' from incompatible pointer type 'const char * (*)(Lisp_Object,  const char *, const char *)' {aka 'const char * (*)(struct Lisp_Object,  const char *, const char *)'} [-Wincompatible-pointer-types]
 4618 |   terminal->get_string_resource_hook = pgtk_get_string_resource;
      |                                      ^

pgtk_get_string_resource should take void * as the 1st argument.

masm11 commented 4 years ago

I did only remove the incorrect mark_object() call.

fejfighter commented 4 years ago

not sure why my compiler didn't throw anything up.

I think you got the main part of the change. When I was looking last night I didn't see the XrmDatabase typedef to void * I was concerned it was coming from the GTK headers