diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/inc/config.h --- a/glib/tsrc/BC/inc/config.h Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/inc/config.h Thu Oct 14 14:15:50 2010 +0530 @@ -1,30 +1,21 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. +* Portions Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* Contributors: * -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 02111-1307, USA. -* -* Description: +* Description: * */ - - - +/* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC. */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ +/* define if asm blocks can use numeric local labels */ +/* #undef ASM_NUMERIC_LABELS */ + +/* poll doesn't work on devices */ +#define BROKEN_POLL 1 + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -40,33 +31,36 @@ /* #undef ENABLE_GC_FRIENDLY_DEFAULT */ /* always defined to indicate that i18n is enabled */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define ENABLE_NLS 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define the gettext package to be used */ #define GETTEXT_PACKAGE "glib20" /* Define to the GLIB binary age */ -#define GLIB_BINARY_AGE 1003 +#define GLIB_BINARY_AGE 2100 /* Byte contents of gmutex */ #define GLIB_BYTE_CONTENTS_GMUTEX 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* Define to the GLIB interface age */ -#define GLIB_INTERFACE_AGE 3 +#define GLIB_INTERFACE_AGE 0 + +/* Define the location where the catalogs will be installed */ +#define GLIB_LOCALE_DIR "NONE/share/locale" /* Define to the GLIB major version */ #define GLIB_MAJOR_VERSION 2 /* Define to the GLIB micro version */ -#define GLIB_MICRO_VERSION 3 +#define GLIB_MICRO_VERSION 4 /* Define to the GLIB minor version */ -#define GLIB_MINOR_VERSION 10 +#define GLIB_MINOR_VERSION 20 /* The size of gmutex, as computed by sizeof. */ -#define GLIB_SIZEOF_GMUTEX 24 +/* #undef GLIB_SIZEOF_GMUTEX */ /* The size of system_thread, as computed by sizeof. */ #define GLIB_SIZEOF_SYSTEM_THREAD 4 @@ -74,6 +68,9 @@ /* alpha atomic implementation */ /* #undef G_ATOMIC_ALPHA */ +/* arm atomic implementation */ +/* #undef G_ATOMIC_ARM */ + /* i486 atomic implementation */ #define G_ATOMIC_I486 1 @@ -91,10 +88,7 @@ /* x86_64 atomic implementation */ /* #undef G_ATOMIC_X86_64 */ - -/* Whether glib was compiled with debugging enabled */ -#define G_COMPILED_WITH_DEBUGGING "minimum" - +#ifndef __SYMBIAN32__ /* Have inline keyword */ #define G_HAVE_INLINE 1 @@ -103,7 +97,7 @@ /* Have __inline__ keyword */ #define G_HAVE___INLINE__ 1 - +#endif//__SYMBIAN32__ /* Source file containing theread implementation */ #define G_THREAD_SOURCE "gthread-posix.c" @@ -114,23 +108,26 @@ /* #undef G_VA_COPY_AS_ARRAY */ /* Define to 1 if you have `alloca', as a function or macro. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_ALLOCA 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define to 1 if you have and it should be used (not on Ultrix). */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_ALLOCA_H 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define to 1 if you have the `atexit' function. */ #define HAVE_ATEXIT 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ATTR_XATTR_H */ + /* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_BIND_TEXTDOMAIN_CODESET 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define if you have a version of the snprintf function with semantics as specified by the ISO C99 standard. */ @@ -140,6 +137,15 @@ specified by the ISO C99 standard. */ #define HAVE_C99_VSNPRINTF 1 +/* define to 1 if Carbon is available */ +/* #undef HAVE_CARBON */ + +/* Define to 1 if you have the `chown' function. */ +/* #undef HAVE_CHOWN */ + +/* Define to 1 if you have the `clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + /* Have nl_langinfo (CODESET) */ #define HAVE_CODESET 1 @@ -161,9 +167,33 @@ /* define for working do while(0) macros */ #define HAVE_DOWHILE_MACROS 1 +/* Define to 1 if you have the `endmntent' function. */ +/* #undef HAVE_ENDMNTENT */ + +/* Define if we have FAM */ +/* #undef HAVE_FAM */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FAM_H */ + +/* Define if we have FAMNoExists in fam */ +/* #undef HAVE_FAM_NO_EXISTS */ + +/* Define to 1 if you have the `fchmod' function. */ +#define HAVE_FCHMOD 1 + +/* Define to 1 if you have the `fchown' function. */ +/* #undef HAVE_FCHOWN */ + +/* Define to 1 if you have the `fdwalk' function. */ +/* #undef HAVE_FDWALK */ + /* Define to 1 if you have the header file. */ #define HAVE_FLOAT_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FSTAB_H */ + /* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 @@ -173,12 +203,30 @@ /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 +/* Define to 1 if you have the `getmntent_r' function. */ +/* #undef HAVE_GETMNTENT_R */ + +/* Define to 1 if you have the `getmntinfo' function. */ +/* #undef HAVE_GETMNTINFO */ + +/* Define to 1 if you have the `getpwuid' function. */ +/* #undef HAVE_GETPWUID */ + /* Define if the GNU gettext() function is already present or preinstalled. */ #define HAVE_GETTEXT 1 +/* Define to 1 if you have the `gmtime_r' function. */ +#define HAVE_GMTIME_R 1 + /* define to use system printf */ #define HAVE_GOOD_PRINTF 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GRP_H */ + +/* Define to 1 if you have the `hasmntopt' function. */ +/* #undef HAVE_HASMNTOPT */ + /* define to support printing 64-bit integers with format I64 */ /* #undef HAVE_INT64_AND_I64 */ @@ -204,6 +252,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 +/* Define to 1 if you have the `link' function. */ +#define HAVE_LINK 1 + /* Define to 1 if you have the header file. */ #define HAVE_LOCALE_H 1 @@ -223,14 +274,14 @@ #define HAVE_LSTAT 1 /* Define to 1 if you have the header file. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_MALLOC_H 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define to 1 if you have the `memalign' function. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_MEMALIGN 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define to 1 if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 @@ -253,21 +304,26 @@ /* Have non-POSIX function getpwuid_r */ /* #undef HAVE_NONPOSIX_GETPWUID_R */ +/* Define to 1 if you have the `nsleep' function. */ +/* #undef HAVE_NSLEEP */ + /* Define to 1 if you have the `on_exit' function. */ #define HAVE_ON_EXIT 1 /* Define to 1 if you have the `poll' function. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_POLL 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ +/* Have POSIX function getgrgid_r */ +/* #undef HAVE_POSIX_GETGRGID_R */ /* Have POSIX function getpwuid_r */ #define HAVE_POSIX_GETPWUID_R 1 /* Define to 1 if you have the `posix_memalign' function. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_POSIX_MEMALIGN 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Have function pthread_attr_setstacksize */ #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 @@ -284,15 +340,30 @@ /* Define to 1 if you have the header file. */ #define HAVE_SCHED_H 1 +/* Define to 1 if libselinux is available */ +/* #undef HAVE_SELINUX */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SELINUX_SELINUX_H */ + /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 +/* Define to 1 if you have the `setmntent' function. */ +/* #undef HAVE_SETMNTENT */ + /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 +/* Define to 1 if you have the `statfs' function. */ +/* #undef HAVE_STATFS */ + +/* Define to 1 if you have the `statvfs' function. */ +/* #undef HAVE_STATVFS */ + /* Define to 1 if you have the header file. */ #define HAVE_STDDEF_H 1 @@ -328,29 +399,89 @@ #define HAVE_STRNCASECMP 1 /* Define to 1 if you have the `strsignal' function. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_STRSIGNAL 1 -#endif // !SYMBIAN +#endif // !__SYMBIAN32__ + +/* Define to 1 if you have the `strsignal' function. */ +/* #undef HAVE_STRSIGNAL */ + +/* Define to 1 if `f_bavail' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_BAVAIL */ + +/* Define to 1 if `f_fstypename' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */ + +/* Define to 1 if `f_basetype' is member of `struct statvfs'. */ +/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */ + +/* Define to 1 if `st_atimensec' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */ + +/* Define to 1 if `st_atim.tv_nsec' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC */ + +/* Define to 1 if `st_blksize' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */ + +/* Define to 1 if `st_blocks' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BLOCKS */ + +/* Define to 1 if `st_ctimensec' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_CTIMENSEC */ + +/* Define to 1 if `st_ctim.tv_nsec' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC */ + +/* Define to 1 if `st_mtimensec' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */ + +/* Define to 1 if `st_mtim.tv_nsec' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC */ /* Define to 1 if you have the `symlink' function. */ #define HAVE_SYMLINK 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_INOTIFY_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MNTCTL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MNTTAB_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MOUNT_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_PARAM_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_POLL_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_RESOURCE_H */ + /* found fd_set in sys/select.h */ #define HAVE_SYS_SELECT_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_STATFS_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_STATVFS_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SYSCTL_H */ + /* Define to 1 if you have the header file. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_SYS_TIMES_H 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_TIME_H 1 @@ -358,6 +489,15 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_VFSTAB_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_VFS_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_VMOUNT_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_WAIT_H 1 @@ -371,10 +511,13 @@ /* Define to 1 if you have the `unsetenv' function. */ #define HAVE_UNSETENV 1 +/* Define to 1 if you have the `utimes' function. */ +#define HAVE_UTIMES 1 + /* Define to 1 if you have the `valloc' function. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_VALLOC 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define to 1 if you have the header file. */ #define HAVE_VALUES_H 1 @@ -391,12 +534,21 @@ /* Define if you have the 'wchar_t' type. */ #define HAVE_WCHAR_T 1 +/* Define to 1 if you have the `wcslen' function. */ +#define HAVE_WCSLEN 1 + /* Define if you have the 'wint_t' type. */ #define HAVE_WINT_T 1 /* Have a working bcopy */ /* #undef HAVE_WORKING_BCOPY */ +/* Define to 1 if xattr is available */ +/* #undef HAVE_XATTR */ + +/* Define to 1 if xattr API uses XATTR_NOFOLLOW */ +/* #undef HAVE_XATTR_NOFOLLOW */ + /* Define to 1 if you have the `_NSGetEnviron' function. */ /* #undef HAVE__NSGETENVIRON */ @@ -406,14 +558,17 @@ /* didn't find fd_set */ /* #undef NO_FD_SET */ +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ + /* global 'sys_errlist' not found */ -/* #undef NO_SYS_ERRLIST */ +#define NO_SYS_ERRLIST 1 /* global 'sys_siglist' not found */ -/* #undef NO_SYS_SIGLIST */ +#define NO_SYS_SIGLIST 1 /* global 'sys_siglist' not declared */ -/* #undef NO_SYS_SIGLIST_DECL */ +#define NO_SYS_SIGLIST_DECL 1 /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=glib" @@ -422,21 +577,21 @@ #define PACKAGE_NAME "glib" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "glib 2.10.3" +#define PACKAGE_STRING "glib 2.20.4" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "glib" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.10.3" +#define PACKAGE_VERSION "2.20.4" /* Maximum POSIX RT priority */ #define POSIX_MAX_PRIORITY sched_get_priority_max(2) /* define if posix_memalign() can allocate any size */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Minimum POSIX RT priority */ #define POSIX_MIN_PRIORITY sched_get_priority_min(2) @@ -450,13 +605,13 @@ /* Define if you have correct malloc prototypes */ #define SANE_MALLOC_PROTOS 1 -/* The size of a `char', as computed by sizeof. */ +/* The size of `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 -/* The size of a `int', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #define SIZEOF_LONG 4 /* The size of a `long long', as computed by sizeof. */ @@ -476,12 +631,15 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. + automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ /* #undef STACK_DIRECTION */ +/* Number of arguments to statfs() */ +/* #undef STATFS_ARGS */ + /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -510,5 +668,18 @@ /* Define to empty if the C compiler doesn't support this keyword. */ /* #undef signed */ -/* Define to `unsigned' if does not define. */ +/* Define to `unsigned int' if does not define. */ /* #undef size_t */ + +#define LINK_SIZE 2 +#define NEWLINE -1 +#define MATCH_LIMIT 10000000 +#define MATCH_LIMIT_RECURSION 8192 +#define MAX_NAME_SIZE 32 +#define MAX_NAME_COUNT 10000 +#define POSIX_MALLOC_THRESHOLD 10 +//define SUPPORT_UTF8 here so that pcre is build with UTF8 support +#define SUPPORT_UTF8 1 +//define SUPPORT_UCP here so that pcre is build with UTF8 properties support +#define SUPPORT_UCP 1 +