Changeset 53725 in vbox

Timestamp:

Jan 4, 2015 1:00:36 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

97503

Message:

shaderapi.c/h: ShaderInitLib() and ShaderDestroyLib() are not valid C prototypes, need to put 'void' keywords into the parentheses.

Location:

trunk/src/VBox/Devices/Graphics/shaderlib

Files:

• shaderapi.c (modified) (2 diffs)
• shaderlib.h (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/shaderlib/shaderapi.c

@@ -139 +139 @@
     pCurrentContext = (struct wined3d_context *)ctx;
 
-SHADERDECL(int) ShaderInitLib()
+SHADERDECL(int) ShaderInitLib(void)
 {
     struct wined3d_gl_info *gl_info = &adapter.gl_info;
@@ -164 +164 @@
 }
 
-SHADERDECL(int) ShaderDestroyLib()
+SHADERDECL(int) ShaderDestroyLib(void)
 {
     return VINF_SUCCESS;

trunk/src/VBox/Devices/Graphics/shaderlib/shaderlib.h

@@ -1 @@
-#ifndef __SHADERLIB_H__
-#define __SHADERLIB_H__
+/* $Id$ */
+/** @file
+ * shaderlib -- interface to WINE's Direct3D shader functions
+ */
+
+/*
+ * Copyright (C) 2014-2015 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+
+#ifndef ___shaderlib_h___
+#define ___shaderlib_h___
 
 #include <VBox/cdefs.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RT_C_DECLS_BEGIN
 
 #ifdef IN_SHADERLIB_STATIC
-#  define SHADERDECL(type)           DECLHIDDEN(type) RTCALL
+# define SHADERDECL(type)           DECLHIDDEN(type) RTCALL
 #else
-#  define SHADERDECL(type)           DECLEXPORT(type) RTCALL
+# define SHADERDECL(type)           DECLEXPORT(type) RTCALL
 #endif
 
 
-SHADERDECL(int) ShaderInitLib();
-SHADERDECL(int) ShaderDestroyLib();
+SHADERDECL(int) ShaderInitLib(void);
+SHADERDECL(int) ShaderDestroyLib(void);
 
 SHADERDECL(int) ShaderContextCreate(void **ppShaderContext);
@@ -42 +58 @@
 SHADERDECL(int) ShaderTransformProjection(unsigned cxViewPort, unsigned cyViewPort, float matrix[16]);
 
-#ifdef __cplusplus
-}
-#endif
+RT_C_DECLS_END
 
-#endif /* __SHADERLIB_H__ */
+#endif /* !___shaderlib_h___ */
+