diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-13 14:24:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-13 14:24:56 +0200 |
| commit | d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed (patch) | |
| tree | 2a860c9d687826b3cb48facfa21c616e14e69347 /mesalib/src/loader | |
| parent | edb5b380994125bf33929ef7dc5a3c456dfbe93b (diff) | |
| download | vcxsrv-d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed.tar.gz vcxsrv-d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed.tar.bz2 vcxsrv-d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed.zip | |
fontconfig libxcb mesa xserver xcb-proto git update 13 Apr 2014
xserver commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2
libxcb commit 29e419c5840a1eeda3336a0802686ee723dcaab3
libxcb/xcb-proto commit 70fea02b7d90d86e9d3b0dc5b61406bf4c910999
pixman commit 4b76bbfda670f9ede67d0449f3640605e1fc4df0
fontconfig commit f44157c809d280e2a0ce87fb078fc4b278d24a67
mesa commit 936dda08ee6d7b2be2b016bc06780e401088ec13
Diffstat (limited to 'mesalib/src/loader')
| -rw-r--r-- | mesalib/src/loader/loader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/loader/loader.c b/mesalib/src/loader/loader.c index e343f4a57..666d0158a 100644 --- a/mesalib/src/loader/loader.c +++ b/mesalib/src/loader/loader.c @@ -202,7 +202,7 @@ out: return (*chip_id >= 0); } -#elif defined(ANDROID) && !defined(__NOT_HAVE_DRM_H) +#elif !defined(__NOT_HAVE_DRM_H) /* for i915 */ #include <i915_drm.h> @@ -219,12 +219,12 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) version = drmGetVersion(fd); if (!version) { log_(_LOADER_WARNING, "MESA-LOADER: invalid drm fd\n"); - return FALSE; + return 0; } if (!version->name) { log_(_LOADER_WARNING, "MESA-LOADER: unable to determine the driver name\n"); drmFreeVersion(version); - return FALSE; + return 0; } if (strcmp(version->name, "i915") == 0) { |