Fix wrongly set ifdef

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2958 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/COpenGLSLMaterialRenderer.cpp

@@ -225,14 +225,16 @@ bool COpenGLSLMaterialRenderer::createShader(GLenum shaderType, const char* shad
 
 	Driver->extGlAttachObject(Program, shaderHandle);
 
-#if defined(GL_ARB_geometry_shader4) || defined(GL_EXT_geometry_shader4) || defined(GL_NV_geometry_shader4)
+#if defined(GL_ARB_geometry_shader4) || defined(GL_EXT_geometry_shader4) || defined(GL_NV_geometry_shader4) || defined(GL_NV_geometry_program4)
 	if (shaderType==GL_GEOMETRY_SHADER_EXT && Driver->queryFeature(EVDF_GEOMETRY_SHADER))
 	{
+#if defined(GL_ARB_geometry_shader4) || defined(GL_EXT_geometry_shader4) || defined(GL_NV_geometry_shader4)
 		Driver->extGlProgramParameteri(Program, GL_GEOMETRY_INPUT_TYPE_EXT, GL_TRIANGLES);
 		Driver->extGlProgramParameteri(Program, GL_GEOMETRY_OUTPUT_TYPE_EXT, GL_TRIANGLE_STRIP);
 		Driver->extGlProgramParameteri(Program, GL_GEOMETRY_VERTICES_OUT_EXT, Driver->MaxGeometryVerticesOut);
 #elif defined(GL_NV_geometry_program4)
 		Driver->extGlProgramVertexLimit(GL_GEOMETRY_PROGRAM_NV, Driver->MaxGeometryVerticesOut);
+#endif
 	}
 #endif
 

source/Irrlicht/aesGladman/aescrypt.c

@@ -61,7 +61,7 @@ extern "C"
 #if defined(ENCRYPTION) && !defined(AES_ASM)
 
 /* Visual C++ .Net v7.1 provides the fastest encryption code when using
-   Pentium optimiation with small code but this is poor for decryption
+   Pentium optimization with small code but this is poor for decryption
    so we need to control this with the following VC++ pragmas
 */
 
@@ -185,7 +185,7 @@ aes_rval aes_encrypt(const void *in_blk, void *out_blk, const aes_encrypt_ctx cx
 #if defined(DECRYPTION) && !defined(AES_ASM)
 
 /* Visual C++ .Net v7.1 provides the fastest encryption code when using
-   Pentium optimiation with small code but this is poor for decryption
+   Pentium optimization with small code but this is poor for decryption
    so we need to control this with the following VC++ pragmas
 */