2 files changed, 0 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/s3v/s3v_lock.h b/src/mesa/drivers/dri/s3v/s3v_lock.h
index f1bb2a9bf2..c39d24a38a 100644
--- a/src/mesa/drivers/dri/s3v/s3v_lock.h
+++ b/src/mesa/drivers/dri/s3v/s3v_lock.h
@@ -7,8 +7,6 @@
 
 #include <sys/ioctl.h>
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void s3vGetLock( s3vContextPtr vmesa, GLuint flags );
 
 /* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -78,8 +76,6 @@ extern int prevLockLine;
       DEBUG_RESET(); \
    } while (0)
 
-#endif
-
 #define S3VHW_LOCK( vmesa )	\
    DRM_UNLOCK(vmesa->driFd, vmesa->driHwLock, vmesa->hHWContext); \
    DRM_SPINLOCK(&vmesa->driScreen->pSAREA->drawable_lock, \
diff --git a/src/mesa/drivers/dri/s3v/s3v_macros.h b/src/mesa/drivers/dri/s3v/s3v_macros.h
index 0779006cdc..3bc871b7ea 100644
--- a/src/mesa/drivers/dri/s3v/s3v_macros.h
+++ b/src/mesa/drivers/dri/s3v/s3v_macros.h
@@ -5,8 +5,6 @@
 #ifndef _S3V_MACROS_H_
 #define _S3V_MACROS_H_
 
-#ifdef GLX_DIRECT_RENDERING
-
 /**************/
 /* DRI macros */
 /**************/
@@ -204,8 +202,6 @@ do { \
 	DEBUG(("GOING HOME\n")); \
 } while (0)
 
-#endif
-
 /**************************/
 /* generic, global macros */
 /**************************/