From ae69a754244c4e475c8d2591772ca8e005071d83 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 18 Feb 2019 11:55:41 +0100
Subject: Update to 5.42

---
 hacks/glx/morph3d.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'hacks/glx/morph3d.c')

diff --git a/hacks/glx/morph3d.c b/hacks/glx/morph3d.c
index 0780444..0f37223 100644
--- a/hacks/glx/morph3d.c
+++ b/hacks/glx/morph3d.c
@@ -58,7 +58,6 @@ static const char sccsid[] = "@(#)morph3d.c	5.01 2001/03/01 xlockmore";
 						"*count: 		0		\n"		\
 						"*suppressRotationAnimation: True\n" \
 
-# define free_morph3d 0
 # define release_morph3d 0
 # define morph3d_handle_event xlockmore_no_events
 # include "xlockmore.h"		/* from the xscreensaver distribution */
@@ -760,7 +759,7 @@ draw_morph3d(ModeInfo * mi)
 		return;
 
     mi->polygon_count = 0;
-	glXMakeCurrent(display, window, *(mp->glx_context));
+	glXMakeCurrent(display, window, *mp->glx_context);
 
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
@@ -832,6 +831,12 @@ change_morph3d(ModeInfo * mi)
 }
 #endif /* !STANDALONE */
 
+ENTRYPOINT void
+free_morph3d(ModeInfo * mi)
+{
+  /* nothing to do */
+}
+
 #endif
 
 XSCREENSAVER_MODULE ("Morph3D", morph3d)
-- 
cgit v1.2.3-55-g7522