Skip to content

Commit

Permalink
Hush compiler warnings when compiling c code.
Browse files Browse the repository at this point in the history
BUG=none
TEST=try bots, local build of pepper app

Review URL: https://chromiumcodereview.appspot.com/12217119

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182073 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
nfullagar@chromium.org committed Feb 13, 2013
1 parent 1fc6d16 commit ebe123f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions ppapi/lib/gl/gles2/gl2ext_ppapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ GLboolean GL_APIENTRY glInitializePPAPI(
return g_gles2_interface ? GL_TRUE : GL_FALSE;
}

GLboolean GL_APIENTRY glTerminatePPAPI() {
GLboolean GL_APIENTRY glTerminatePPAPI(void) {
g_gles2_interface = NULL;
return GL_TRUE;
}
Expand All @@ -85,40 +85,40 @@ void GL_APIENTRY glSetCurrentContextPPAPI(PP_Resource context) {
g_current_context = context;
}

PP_Resource GL_APIENTRY glGetCurrentContextPPAPI() {
PP_Resource GL_APIENTRY glGetCurrentContextPPAPI(void) {
return g_current_context;
}

const struct PPB_OpenGLES2* GL_APIENTRY glGetInterfacePPAPI() {
const struct PPB_OpenGLES2* GL_APIENTRY glGetInterfacePPAPI(void) {
return g_gles2_interface;
}

const struct PPB_OpenGLES2InstancedArrays* GL_APIENTRY
glGetInstancedArraysInterfacePPAPI() {
glGetInstancedArraysInterfacePPAPI(void) {
return g_gles2_instanced_arrays_interface;
}

const struct PPB_OpenGLES2FramebufferBlit* GL_APIENTRY
glGetFramebufferBlitInterfacePPAPI() {
glGetFramebufferBlitInterfacePPAPI(void) {
return g_gles2_framebuffer_blit_interface;
}

const struct PPB_OpenGLES2FramebufferMultisample* GL_APIENTRY
glGetFramebufferMultisampleInterfacePPAPI() {
glGetFramebufferMultisampleInterfacePPAPI(void) {
return g_gles2_framebuffer_multisample_interface;
}

const struct PPB_OpenGLES2ChromiumEnableFeature* GL_APIENTRY
glGetChromiumEnableFeatureInterfacePPAPI() {
glGetChromiumEnableFeatureInterfacePPAPI(void) {
return g_gles2_chromium_enable_feature_interface;
}

const struct PPB_OpenGLES2ChromiumMapSub* GL_APIENTRY
glGetChromiumMapSubInterfacePPAPI() {
glGetChromiumMapSubInterfacePPAPI(void) {
return g_gles2_chromium_map_sub_interface;
}

const struct PPB_OpenGLES2Query* GL_APIENTRY
glGetQueryInterfacePPAPI() {
glGetQueryInterfacePPAPI(void) {
return g_gles2_query_interface;
}
18 changes: 9 additions & 9 deletions ppapi/lib/gl/gles2/gl2ext_ppapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,29 @@ GL_APICALL GLboolean GL_APIENTRY glInitializePPAPI(

// Terminates OpenGL ES 2.0 library.
// GL_FALSE is returned on failure, GL_TRUE otherwise.
GL_APICALL GLboolean GL_APIENTRY glTerminatePPAPI();
GL_APICALL GLboolean GL_APIENTRY glTerminatePPAPI(void);

// Sets context to be used for rendering in the current thread.
GL_APICALL void GL_APIENTRY glSetCurrentContextPPAPI(PP_Resource context);

// Gets context being used for rendering in the current thread.
// Returns NULL if a context has not been set yet.
GL_APICALL PP_Resource GL_APIENTRY glGetCurrentContextPPAPI();
GL_APICALL PP_Resource GL_APIENTRY glGetCurrentContextPPAPI(void);

// Returns OpenGL ES 2.0 interface.
GL_APICALL const struct PPB_OpenGLES2* GL_APIENTRY glGetInterfacePPAPI();
GL_APICALL const struct PPB_OpenGLES2* GL_APIENTRY glGetInterfacePPAPI(void);
GL_APICALL const struct PPB_OpenGLES2InstancedArrays* GL_APIENTRY
glGetInstancedArraysInterfacePPAPI();
glGetInstancedArraysInterfacePPAPI(void);
GL_APICALL const struct PPB_OpenGLES2FramebufferBlit* GL_APIENTRY
glGetFramebufferBlitInterfacePPAPI();
glGetFramebufferBlitInterfacePPAPI(void);
GL_APICALL const struct PPB_OpenGLES2FramebufferMultisample* GL_APIENTRY
glGetFramebufferMultisampleInterfacePPAPI();
glGetFramebufferMultisampleInterfacePPAPI(void);
GL_APICALL const struct PPB_OpenGLES2ChromiumEnableFeature* GL_APIENTRY
glGetChromiumEnableFeatureInterfacePPAPI();
glGetChromiumEnableFeatureInterfacePPAPI(void);
GL_APICALL const struct PPB_OpenGLES2ChromiumMapSub* GL_APIENTRY
glGetChromiumMapSubInterfacePPAPI();
glGetChromiumMapSubInterfacePPAPI(void);
GL_APICALL const struct PPB_OpenGLES2Query* GL_APIENTRY
glGetQueryInterfacePPAPI();
glGetQueryInterfacePPAPI(void);

#ifdef __cplusplus
}
Expand Down

0 comments on commit ebe123f

Please sign in to comment.