Fix warning: extra tokens at end of #else or #endif directive

OpenXRay · Sep 29, 2018 · cba90d9 · cba90d9
1 parent 8e3d1c6
commit cba90d9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Externals/ode/ode/src/StepJointInternal.h b/Externals/ode/ode/src/StepJointInternal.h
@@ -1,4 +1,4 @@
 #ifndef STEP_JOINT_INTERNAL_H
 #define STEP_JOINT_INTERNAL_H
 	void dInternalStepJointContact (dxWorld * world, dxBody * body[2], dReal * GI[2], dReal * GinvI[2], dxJoint * joint, dxJoint::Info1 info, dxJoint::Info2 Jinfo, dReal stepsize);
-#endif STEP_JOINT_INTERNAL_H
+#endif // STEP_JOINT_INTERNAL_H
diff --git a/src/Layers/xrRender/FSkinned.cpp b/src/Layers/xrRender/FSkinned.cpp
@@ -1382,7 +1382,7 @@ void CSkeletonX_ext::_FillVertices(const Fmatrix& view, CSkeletonWallmark& wm, c
     u16* indices = nullptr;
 #if    defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
 	indices = *m_Indices;
-#else    //    USE_DX10
+#else // USE_DX10
     CHK_DX(V->p_rm_Indices->Lock(0, V->dwPrimitives * 3, (void**)&indices, D3DLOCK_READONLY));
     // fill vertices
     switch (RenderMode)
@@ -1549,7 +1549,7 @@ void CSkeletonX_ext::_EnumBoneVertices(SEnumVerticesCallback& C, Fvisual* V, u16
 #if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
     VERIFY(*m_Indices);
     indices = *m_Indices;
-#else USE_DX10
+#else // USE_DX10
     CHK_DX(V->p_rm_Indices->Lock(0, V->dwPrimitives * 3, (void**)&indices, D3DLOCK_READONLY));
     // fill vertices
     void* vertices = nullptr;
@@ -1558,7 +1558,7 @@ void CSkeletonX_ext::_EnumBoneVertices(SEnumVerticesCallback& C, Fvisual* V, u16
     switch (RenderMode)
     {
     case RM_SKINNING_SOFT:
-#endif	//	USE_DX10
+#endif // USE_DX10
     {
         if (*Vertices1W)
             TEnumBoneVertices(Vertices1W, indices + iBase, *faces, C);

diff --git a/src/Layers/xrRender/R_Backend.cpp b/src/Layers/xrRender/R_Backend.cpp
@@ -208,4 +208,4 @@ void CBackend::DestroyConstantBuffers()
     _RELEASE(m_pPixelConstants);
 }
 */
-#endif USE_DX10
+#endif //	USE_DX10
diff --git a/src/Layers/xrRender/R_Backend_Runtime.cpp b/src/Layers/xrRender/R_Backend_Runtime.cpp
@@ -13,7 +13,7 @@
 #if defined(USE_DX10) || defined(USE_DX11)
 #include "Layers/xrRenderDX10/StateManager/dx10StateManager.h"
 #include "Layers/xrRenderDX10/StateManager/dx10ShaderResourceStateCache.h"
-#endif USE_DX10
+#endif // USE_DX10
 
 void CBackend::OnFrameEnd()
 {

diff --git a/src/Layers/xrRender/SkeletonX.h b/src/Layers/xrRender/SkeletonX.h
@@ -165,7 +165,7 @@ BOOL pick_bone(CKinematics* Parent, IKinematics::pick_result& r, float dist, con
     VERIFY(!"Not implemented");
     return FALSE;
 }
-#else USE_DX10
+#else //	USE_DX10
 template <typename T>
 BOOL pick_bone(CKinematics* Parent, IKinematics::pick_result& r, float dist, const Fvector& S, const Fvector& D,
     Fvisual* V, u16* indices, CBoneData::FacesVec& faces)