diff options
| author | aavit <qt-info@nokia.com> | 2010-02-20 12:55:41 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-02-20 12:55:41 (GMT) |
| commit | 06f96dbdcaeeb82d57b8d1f23cbbd498ddfc88c2 (patch) | |
| tree | 50b9a0f5551b6b2ead9834ef1700723dc71a6841 /src/3rdparty/libtiff/port/lfind.c | |
| parent | 3d99c35cb79b39fb1b34fcf78810e3564b893626 (diff) | |
| parent | 496f2b5eb0f5a308f3b8e06eb2a704fd4b77f6dc (diff) | |
| download | Qt-06f96dbdcaeeb82d57b8d1f23cbbd498ddfc88c2.zip Qt-06f96dbdcaeeb82d57b8d1f23cbbd498ddfc88c2.tar.gz Qt-06f96dbdcaeeb82d57b8d1f23cbbd498ddfc88c2.tar.bz2 | |
Merge branch 'rtiff392'
Conflicts:
doc/src/legal/3rdparty.qdoc
Diffstat (limited to 'src/3rdparty/libtiff/port/lfind.c')
| -rw-r--r-- | src/3rdparty/libtiff/port/lfind.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff/port/lfind.c b/src/3rdparty/libtiff/port/lfind.c index d2f14ee..64b261c 100644 --- a/src/3rdparty/libtiff/port/lfind.c +++ b/src/3rdparty/libtiff/port/lfind.c @@ -1,4 +1,4 @@ -/* $Id: lfind.c,v 1.3 2005/12/27 15:08:22 dron Exp $ */ +/* $Id: lfind.c,v 1.4 2007/01/15 18:40:39 mloskot Exp $ */ /* * Copyright (c) 1989, 1993 @@ -37,7 +37,11 @@ static char sccsid[] = "@(#)lsearch.c 8.1 (Berkeley) 6/4/93"; __RCSID("$NetBSD: lsearch.c,v 1.2 2005/07/06 15:47:15 drochner Exp $"); #endif -#include <sys/types.h> +#ifdef _WIN32_WCE +# include <wce_types.h> +#else +# include <sys/types.h> +#endif #ifndef NULL # define NULL 0 |