[vlc-commits] glwin32: Don't return an error code from a void function

Martin Storsjö git at videolan.org
Wed Dec 20 17:04:24 CET 2017


vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Wed Dec 20 15:49:16 2017 +0200| [14472778454bbfc02d5fb40f90f01c3b620bb9ce] | committer: Jean-Baptiste Kempf

glwin32: Don't return an error code from a void function

This fixes a compiler error with clang, present since ed9fe3b7:

glwin32.c:249:9: error: void function 'Manage' should not return a value [-Wreturn-type]
        return VLC_EGENERIC;
        ^      ~~~~~~~~~~~~

(cherry picked from commit 69bf49a1037522d1cd640fdcb5b32107db6e78aa)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=14472778454bbfc02d5fb40f90f01c3b620bb9ce
---

 modules/video_output/win32/glwin32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_output/win32/glwin32.c b/modules/video_output/win32/glwin32.c
index 47c4d6d0d3..07195e55c1 100644
--- a/modules/video_output/win32/glwin32.c
+++ b/modules/video_output/win32/glwin32.c
@@ -246,7 +246,7 @@ static void Manage (vout_display_t *vd)
     const int height = sys->sys.rect_dest.bottom - sys->sys.rect_dest.top;
     vlc_gl_Resize (sys->gl, width, height);
     if (vlc_gl_MakeCurrent (sys->gl) != VLC_SUCCESS)
-        return VLC_EGENERIC;
+        return;
     vout_display_opengl_SetWindowAspectRatio(sys->vgl, (float)width / height);
     vout_display_opengl_Viewport(sys->vgl, 0, 0, width, height);
     vlc_gl_ReleaseCurrent (sys->gl);



More information about the vlc-commits mailing list