You're right. This was caused by a sloppy fix by me for another problem.

I'll revert that fix tomorrow and try to find a correct fix for that problem.

/Thomas



On 01/21/2011 10:57 PM, Gaetan Nadon wrote:
On Fri, 2011-01-21 at 20:07 +0100, Cyril Brulebois wrote:
HAVE_LIBDRM comes from config.h, so include it first.

With CFLAGS="-Wall -Werror", the build fails with:
|   CC     vmware_drv_la-vmwaremodule.lo
| cc1: warnings being treated as errors
| vmwaremodule.c: In function ‘vmware_check_kernel_module’:
| vmwaremodule.c:100: error: implicit declaration of function ‘drmOpen’
| vmwaremodule.c:112: error: implicit declaration of function ‘drmClose’

Signed-off-by: Cyril Brulebois<[email protected]  <mailto:[email protected]>>
---
  src/vmwaremodule.c |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vmwaremodule.c b/src/vmwaremodule.c
index a7ba854..2754879 100644
--- a/src/vmwaremodule.c
+++ b/src/vmwaremodule.c
@@ -26,14 +26,14 @@
  #include<xorg-server.h>
  #include<xf86.h>

-#ifdef HAVE_LIBDRM
-#include<xf86drm.h>
-#endif
-
  #ifdef HAVE_CONFIG_H
  #include "config.h"
  #endif

+#ifdef HAVE_LIBDRM
+#include<xf86drm.h>
+#endif
+
  #ifndef HAVE_XORG_SERVER_1_5_0
  #include<xf86_ansic.h>
  #include<xf86_libc.h>
--
1.7.2.3


This is the correct order.

Reviewed-by: Gaetan Nadon <[email protected] <mailto:[email protected]>>

I have copied the driver maintainer who will review and potentially push the patch.
http://www.x.org/wiki/vmware


_______________________________________________
[email protected]  <mailto:[email protected]>: X.Org development
Archives:http://lists.x.org/archives/xorg-devel
Info:http://lists.x.org/mailman/listinfo/xorg-devel

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to