diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-09 17:05:56 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-09 17:05:56 +0100 |
| commit | 72d7f8d5af476f12dc75eab4fa9d59364cbec190 (patch) | |
| tree | 1efac13a52811bfd28ae51538b15f87cbfaf8939 /pixman/test/composite.c | |
| parent | a3d796bcc7de83fd88b42e09c6a82a8df4f9b836 (diff) | |
| parent | a8e5f06fe01732fbd643bc435dd3b8eaa602defe (diff) | |
| download | vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.tar.gz vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.tar.bz2 vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
Diffstat (limited to 'pixman/test/composite.c')
| -rw-r--r-- | pixman/test/composite.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pixman/test/composite.c b/pixman/test/composite.c index 408c363a3..fe59eae3c 100644 --- a/pixman/test/composite.c +++ b/pixman/test/composite.c @@ -22,8 +22,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -#define PIXMAN_USE_INTERNAL_API -#include <pixman.h> #include <stdio.h> #include <stdlib.h> /* abort() */ #include <math.h> |