# HG changeset patch # User Stefan Karlsson # Date 1269862071 -3600 # Node ID 69a2780c0013fb8c2d65823f20d4741956088f1a # Parent ef48f5dc1b7f1afe66441c7b88ba5dbbd12e6de9# Parent 4af2d5a55d1aa2224fe4c23b8022ae6aefb2753a Merge. diff -r 4af2d5a55d1a -r 69a2780c0013 compressionlibs/ziplib/inc/zipfilememberinputstream.h --- a/compressionlibs/ziplib/inc/zipfilememberinputstream.h Sun Mar 14 13:16:04 2010 +0000 +++ b/compressionlibs/ziplib/inc/zipfilememberinputstream.h Mon Mar 29 12:27:51 2010 +0100 @@ -76,7 +76,7 @@ RZipFileMemberReaderStream(CZipFile&, TUint32, TUint32, TUint32, TUint32); static RZipFileMemberReaderStream* NewL(CZipFile&, TUint32, TUint32, TUint32, TUint32); - void RZipFileMemberReaderStream::ConstructL(); + void ConstructL(); virtual TInt Read(void); virtual TInt Read(TByte*, TUint32, TUint32*); diff -r 4af2d5a55d1a -r 69a2780c0013 genericopenlibs/openenvcore/libc/inc/gdtoa.h --- a/genericopenlibs/openenvcore/libc/inc/gdtoa.h Sun Mar 14 13:16:04 2010 +0000 +++ b/genericopenlibs/openenvcore/libc/inc/gdtoa.h Mon Mar 29 12:27:51 2010 +0100 @@ -43,7 +43,8 @@ #ifndef Long #define Long long #endif -#ifndef ULong +#ifndef ULong_DEF +#define ULong_DEF typedef unsigned Long ULong; #endif #ifndef UShort diff -r 4af2d5a55d1a -r 69a2780c0013 genericopenlibs/openenvcore/libc/inc/gdtoatypes.h --- a/genericopenlibs/openenvcore/libc/inc/gdtoatypes.h Sun Mar 14 13:16:04 2010 +0000 +++ b/genericopenlibs/openenvcore/libc/inc/gdtoatypes.h Mon Mar 29 12:27:51 2010 +0100 @@ -27,7 +27,8 @@ #define PRIVATE_mem ((PRIVATE_MEM+sizeof(double)-1)/sizeof(double)) #endif -#ifndef ULong +#ifndef ULong_DEF +#define ULong_DEF typedef unsigned long ULong; #endif diff -r 4af2d5a55d1a -r 69a2780c0013 glib/libglib/src/gatomic.c --- a/glib/libglib/src/gatomic.c Sun Mar 14 13:16:04 2010 +0000 +++ b/glib/libglib/src/gatomic.c Mon Mar 29 12:27:51 2010 +0100 @@ -38,7 +38,44 @@ #if defined (__GNUC__) -# if defined (G_ATOMIC_I486) +#define GCC_VERSION (__GNUC__ * 10000 \ + + __GNUC_MINOR__ * 100 \ + + __GNUC_PATCHLEVEL__) + +/* Test for GCC > 4.4.0 */ +# if (GCC_VERSION > 40400) + +EXPORT_C gint +g_atomic_int_exchange_and_add (volatile gint *atomic, + gint val) +{ + return __sync_fetch_and_add(atomic, val); +} + +EXPORT_C void +g_atomic_int_add (volatile gint *atomic, + gint val) +{ + __sync_fetch_and_add(atomic, val); +} + +EXPORT_C gboolean +g_atomic_int_compare_and_exchange (volatile gint *atomic, + gint oldval, + gint newval) +{ + return __sync_val_compare_and_swap(atomic, oldval, newval); +} + +EXPORT_C gboolean +g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic, + gpointer oldval, + gpointer newval) +{ + return __sync_val_compare_and_swap(atomic, oldval, newval); +} + +#elif defined (G_ATOMIC_I486) /* Adapted from CVS version 1.10 of glibc's sysdeps/i386/i486/bits/atomic.h */ EXPORT_C gint diff -r 4af2d5a55d1a -r 69a2780c0013 glib/libglib/src/gfileutils.c --- a/glib/libglib/src/gfileutils.c Sun Mar 14 13:16:04 2010 +0000 +++ b/glib/libglib/src/gfileutils.c Mon Mar 29 12:27:51 2010 +0100 @@ -60,6 +60,8 @@ #endif /* __SYMBIAN32__ */ +static gint create_temp_file (gchar *tmpl, int permissions); + /** * g_mkdir_with_parents: * @pathname: a pathname in the GLib file name encoding diff -r 4af2d5a55d1a -r 69a2780c0013 ofdbus/dbus/dbus/filecheck.cpp --- a/ofdbus/dbus/dbus/filecheck.cpp Sun Mar 14 13:16:04 2010 +0000 +++ b/ofdbus/dbus/dbus/filecheck.cpp Mon Mar 29 12:27:51 2010 +0100 @@ -242,57 +242,50 @@ int _dbus_file_open_for_write(const unsigned char* data) { - - const unsigned char* sid_directory; - const DBusString *homedir; - dbus_bool_t retval; - DBusString dirname; + const DBusString *homedir; + + // getting the private or homedir directory of the process + if(!_dbus_homedir_from_current_process(&homedir)) + return FALSE; + + const unsigned char* sid_directory; + DBusString dirname; + //*(char*)(homedir->dummy1) = 'C'; + if(!_dbus_string_init(&dirname)) + return FALSE; + + _dbus_string_copy(homedir,0,&dirname,0); + *(char*)(dirname.dummy1) = 'C'; + + //sid_directory = (const unsigned char*)_dbus_string_get_const_data(homedir); + sid_directory = (const unsigned char*)_dbus_string_get_const_data(&dirname); - retval = FALSE; - - if(!_dbus_homedir_from_current_process(&homedir)) //getting the private or homedir directory of the process - { - goto out_0; - } - - //*(char*)(homedir->dummy1) = 'C'; - if(!_dbus_string_init(&dirname)) - return FALSE; - - _dbus_string_copy(homedir,0,&dirname,0); - *(char*)(dirname.dummy1) = 'C'; - - //sid_directory = (const unsigned char*)_dbus_string_get_const_data(homedir); - sid_directory = (const unsigned char*)_dbus_string_get_const_data(&dirname); - - TBuf8<100>Filename8; - Filename8.Append(sid_directory,strlen((const char*)sid_directory)); - Filename8.Append(_L8("\\foobar_")); - Filename8.Append(sid_directory + 11,strlen((const char*)sid_directory + 11)); - - TBuf16<50>Filename16; - Filename16.Copy(Filename8); - - RFs fs; - User::LeaveIfError(fs.Connect()); - - RFile file; - - User::LeaveIfError(file.Open(fs,Filename16,EFileRead)); - file.Close(); - - User::LeaveIfError(file.Open(fs,Filename16,EFileWrite)); - - TBuf8<100>pid_data(data); - User::LeaveIfError(file.Write(pid_data)); - - retval = TRUE; - -out_0 : - _dbus_string_free(&dirname); - file.Close(); - fs.Close(); - return retval; + TBuf8<100>Filename8; + Filename8.Append(sid_directory,strlen((const char*)sid_directory)); + Filename8.Append(_L8("\\foobar_")); + Filename8.Append(sid_directory + 11,strlen((const char*)sid_directory + 11)); + + TBuf16<50>Filename16; + Filename16.Copy(Filename8); + + RFs fs; + User::LeaveIfError(fs.Connect()); + + RFile file; + + User::LeaveIfError(file.Open(fs,Filename16,EFileRead)); + file.Close(); + + User::LeaveIfError(file.Open(fs,Filename16,EFileWrite)); + + TBuf8<100>pid_data(data); + User::LeaveIfError(file.Write(pid_data)); + + _dbus_string_free(&dirname); + file.Close(); + fs.Close(); + + return TRUE; } int _dbus_open_file_for_read(const unsigned char* pid,const unsigned char* hash,const unsigned char* sid_directory) @@ -354,4 +347,4 @@ return retval; } -} //end extern"C" \ No newline at end of file +} //end extern"C"