xf86-video-vmware: Changes to 'master'

[Dave Airlie]

 src/compat-api.h  |    2 +-
 src/vmware.h      |    6 ------
 src/vmwarecurs.c  |   17 +++++++++--------
 src/vmwarevideo.c |    5 +++--
 4 files changed, 13 insertions(+), 17 deletions(-)

New commits:
commit e5ac80d8f72963313358e31cfb1ab98583e26f23
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jul 3 13:50:30 2012 +0100

    vmware: avoid warnings about shadowing 'i'
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit 46c0862d205eefa985e36a74391ca392640cb898
Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Jun 16 14:43:52 2012 +0100

    vmware: drop infoFromScreen inline in favour of new interface
    
    This also should fix the build regression introduced with the fix
    for this macro.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>