X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fxpm-pixmap.h;h=7b6e1330e3bc35e0b2b164bc80c953b9182bdc9e;hp=90e4ff57867564bf166d35c79a26678fc6e04306;hb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;hpb=ccb7f4903325f92555a9722bba74b58346654ba0 diff --git a/hacks/xpm-pixmap.h b/hacks/xpm-pixmap.h index 90e4ff57..7b6e1330 100644 --- a/hacks/xpm-pixmap.h +++ b/hacks/xpm-pixmap.h @@ -1,5 +1,5 @@ /* xpm-pixmap.h --- converts XPM data to Pixmaps. - * xscreensaver, Copyright (c) 1998, 2002 Jamie Zawinski + * xscreensaver, Copyright (c) 1998-2006 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -15,7 +15,8 @@ /* Returns a Pixmap structure containing the bits of the given XPM image. */ -extern Pixmap xpm_data_to_pixmap (Display *, Window, char **xpm_data, +extern Pixmap xpm_data_to_pixmap (Display *, Window, + /*const*/ char * const *xpm_data, int *width_ret, int *height_ret, Pixmap *mask_ret); extern Pixmap xpm_file_to_pixmap (Display *, Window, const char *filename,