|
OK, Refer to http://gcc.gnu.org/onlinedocs/gcc/Function-Names.html In C, __PRETTY_FUNCTION__ is yet another name for
__func__.so I will use __func__ here. here is the patch. and now trunk can be build with Sun Studio 12. Hi Jerry! Note that G_GNUC_[PRETTY_]FUNCTION are deprecated since glib 2.16, see bug #409360 On vie, 2008-11-07 at 18:09 +0800, Jerry Tan wrote:__func__ and __PRETTY_FUNCTION__ are not supported by sun compiler, add this patch to make it build. _______________________________________________ tracker-list mailing list tracker-list gnome org http://mail.gnome.org/mailman/listinfo/tracker-list |
Index: src/libtracker/tracker.h
===================================================================
--- src/libtracker/tracker.h (revision 2615)
+++ src/libtracker/tracker.h (working copy)
@@ -20,6 +20,10 @@
#ifndef TRACKER_H
#define TRACKER_H
+#ifndef __FUNCTION__
+#define __FUNCTION__ __func__
+#endif
+
G_BEGIN_DECLS
#include <dbus/dbus.h>
Index: src/tracker-indexer/modules/evolution-common.c
===================================================================
--- src/tracker-indexer/modules/evolution-common.c (revision 2615)
+++ src/tracker-indexer/modules/evolution-common.c (working copy)
@@ -24,6 +24,7 @@
#include <string.h>
#include <fcntl.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <tracker-indexer/tracker-metadata-utils.h>
Index: src/trackerd/tracker-files.c
===================================================================
--- src/trackerd/tracker-files.c (revision 2615)
+++ src/trackerd/tracker-files.c (working copy)
@@ -24,6 +24,7 @@
#include <string.h>
#include <libtracker-common/tracker-dbus.h>
+#include <libtracker-common/tracker-config.h>
#include <libtracker-common/tracker-log.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-common/tracker-file-utils.h>
@@ -483,7 +484,7 @@
tracker_dbus_request_failed (request_id,
&actual_error,
"%s not implemented yet",
- __PRETTY_FUNCTION__);
+ __FUNCTION__);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
}
Index: src/libtracker-db/tracker-db-index.c
===================================================================
--- src/libtracker-db/tracker-db-index.c (revision 2615)
+++ src/libtracker-db/tracker-db-index.c (working copy)
@@ -29,6 +29,7 @@
#include <glib/gstdio.h>
#include <libtracker-common/tracker-log.h>
+#include <libtracker-common/tracker-config.h>
#include <libtracker-common/tracker-file-utils.h>
#include <libtracker-db/tracker-db-manager.h>
Index: src/libtracker-common/tracker-config.h
===================================================================
--- src/libtracker-common/tracker-config.h (revision 2615)
+++ src/libtracker-common/tracker-config.h (working copy)
@@ -23,6 +23,9 @@
#ifndef __LIBTRACKER_COMMON_CONFIG_H__
#define __LIBTRACKER_COMMON_CONFIG_H__
+#ifndef __FUNCTION__
+#define __FUNCTION__ __func__
+#endif
#include <glib-object.h>
G_BEGIN_DECLS