http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.01.tar.gz

[xscreensaver] / hacks / glx / pulsar.c

diff --git a/hacks/glx/pulsar.c b/hacks/glx/pulsar.c
index 7c67b83537991a979bb68885711e3f631ace43f6..9d894f4085e6b0555eec17a19517966e9f454c5e 100644 (file)
--- a/hacks/glx/pulsar.c
+++ b/hacks/glx/pulsar.c
@@ -74,13 +74,6 @@
 
 #ifdef USE_GL /* whole file */
 
-#ifdef HAVE_XPM
-# include <X11/xpm.h>
-# ifndef PIXEL_ALREADY_TYPEDEFED
-# define PIXEL_ALREADY_TYPEDEFED /* Sigh, Xmu/Drawing.h needs this... */
-# endif
-#endif
-
 #ifdef HAVE_XMU
 # ifndef VMS
 #  include <X11/Xmu/Drawing.h>
@@ -93,9 +86,9 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 
-#include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 /* Functions for loading and storing textures */
 
@@ -613,7 +606,7 @@ void drawQuads(void) {
 
 GLvoid drawScene(ModeInfo * mi) 
 {
-  check_gl_error ("drawScene");
+/*  check_gl_error ("drawScene"); */
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
   /* we have to do this here because the FPS meter turns these 3 features off!! */
@@ -647,7 +640,7 @@ GLvoid drawScene(ModeInfo * mi)
   /* increment frame-counter */
   frame++;
 
-  check_gl_error ("drawScene");
+/*  check_gl_error ("drawScene"); */
 }