[MPlayer-cvslog] r36334 - trunk/libvo/gl_common.c

[Reimar Döffinger]

Guillaume POIRIER <poirierg at gmail.com> wrote:

>Hello,
>
>2013/6/12 Reimar Döffinger <Reimar.Doeffinger at gmx.de>:
>> Guillaume POIRIER <poirierg at gmail.com> wrote:
>
>>>2013/6/12 Reimar Döffinger <Reimar.Doeffinger at gmx.de>:
>>>> Guillaume POIRIER <poirierg at gmail.com> wrote:
>>>>>It fails because new_gpu_program() is #defined that way:
>>>>>
>>>>>#if defined(CONFIG_GL_EGL_X11) || defined(CONFIG_GL_EGL_ANDROID)
>>>>>static GLuint new_gpu_program(void) {
>>>>>
>>>>>Thoughts?
>>>>
>>>> Just remove the #if, it's only there to avoid a warning.
>>>
>>>
>>>It indeed fixes the problem. But what is the proper way to fix this?
>>>Should it test for CONFIG_GL_OSX as well?
>>
>> No, simply removing the #if is the proper fix. All variants can use
>the code. The code is platform-independent. It was only due to my
>laziness it only worked with GLES before.
>
>
>Ok. Do you want me to commit a change that would just remove that #if ?
>You're the maintainer, so I won't dare unless you give me the go-ahead.

Please, I've never bitten anyone's head off, one-liners that fix compilation should always be considered fine to commit.
I'm all for a cautious approach but don't overdo it :-)