diff options
author | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
commit | aa7530630e595b80d5db54655fd827b61edc0fd7 (patch) | |
tree | 048cb74072450c7592f254c3537ac8f252d09d73 /hacks/xlockmore.h | |
parent | Forgot one DPMS killing instance (diff) | |
parent | Update to 5.42 (diff) | |
download | xscreensaver-23.tar.gz xscreensaver-23.tar.xz xscreensaver-23.zip |
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/xlockmore.h')
-rw-r--r-- | hacks/xlockmore.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hacks/xlockmore.h b/hacks/xlockmore.h index 285a126..bbb7f84 100644 --- a/hacks/xlockmore.h +++ b/hacks/xlockmore.h @@ -1,5 +1,5 @@ /* xlockmore.h --- xscreensaver compatibility layer for xlockmore modules. - * xscreensaver, Copyright (c) 1997-2017 Jamie Zawinski <jwz@jwz.org> + * xscreensaver, Copyright (c) 1997-2018 Jamie Zawinski <jwz@jwz.org> * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -177,8 +177,10 @@ ERROR! Sorry, xlockmore.h requires ANSI C (gcc, for example.) # ifdef USE_GL # define XLOCKMORE_FPS xlockmore_gl_compute_fps +# define XLOCKMORE_FPS_FREE xlockmore_gl_free_fps # else # define XLOCKMORE_FPS xlockmore_do_fps +# define XLOCKMORE_FPS_FREE fps_free # endif # ifdef HAVE_JWXYZ @@ -246,7 +248,7 @@ ERROR! Sorry, xlockmore.h requires ANSI C (gcc, for example.) xlockmore_setup, \ & NAME ## _xlockmore_function_table, \ 0, 0, 0, 0, 0, \ - XLOCKMORE_FPS, \ + XLOCKMORE_FPS, XLOCKMORE_FPS_FREE, \ XLOCKMORE_VISUAL }; \ \ XSCREENSAVER_LINK (NAME ## _xscreensaver_function_table) |