aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2005-05-03 19:19:18 +0800
committerMichael Zucci <zucchi@src.gnome.org>2005-05-03 19:19:18 +0800
commit485851ec70d6b189a78162008fef0bad23c2e181 (patch)
treeddf255f96f49451f2fb140c8cd0e3267de5c5155 /e-util
parent3da049b17c8b76fc69087c256200253214b1e8ca (diff)
downloadgsoc2013-evolution-485851ec70d6b189a78162008fef0bad23c2e181.tar
gsoc2013-evolution-485851ec70d6b189a78162008fef0bad23c2e181.tar.gz
gsoc2013-evolution-485851ec70d6b189a78162008fef0bad23c2e181.tar.bz2
gsoc2013-evolution-485851ec70d6b189a78162008fef0bad23c2e181.tar.lz
gsoc2013-evolution-485851ec70d6b189a78162008fef0bad23c2e181.tar.xz
gsoc2013-evolution-485851ec70d6b189a78162008fef0bad23c2e181.tar.zst
gsoc2013-evolution-485851ec70d6b189a78162008fef0bad23c2e181.zip
undefine e_profile_event_emit if we are compiled without profiling. The
2005-05-03 Not Zed <NotZed@Ximian.com> * e-profile-event.c (e_profile_event_emit): undefine e_profile_event_emit if we are compiled without profiling. The 'abi' is not, nor was ever changed. * e-profile-event.h: revert previous patch, the assumptions were incorrect & the code misunderstood. svn path=/trunk/; revision=29261
Diffstat (limited to 'e-util')
-rw-r--r--e-util/ChangeLog9
-rw-r--r--e-util/e-profile-event.c12
-rw-r--r--e-util/e-profile-event.h5
3 files changed, 24 insertions, 2 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index fd455769b2..791ad79c16 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-03 Not Zed <NotZed@Ximian.com>
+
+ * e-profile-event.c (e_profile_event_emit): undefine
+ e_profile_event_emit if we are compiled without profiling. The
+ 'abi' is not, nor was ever changed.
+
+ * e-profile-event.h: revert previous patch, the assumptions were
+ incorrect & the code misunderstood.
+
2005-05-02 Rodney Dawes <dobey@novell.com>
* e-profile-event.h (e_profile_event_emit): This method is a no-op if
diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c
index a4d2bbe94c..5b4495a31d 100644
--- a/e-util/e-profile-event.c
+++ b/e-util/e-profile-event.c
@@ -121,16 +121,24 @@ e_profile_event_target_new(EProfileEvent *eme, const char *id, const char *uid,
return t;
}
+#ifdef ENABLE_PROFILING
void
e_profile_event_emit(const char *id, const char *uid, guint32 flags)
{
-#ifdef ENABLE_PROFILING
EProfileEvent *epe = e_profile_event_peek();
EProfileEventTarget *t = e_profile_event_target_new(epe, id, uid, flags);
e_event_emit((EEvent *)epe, "event", (EEventTarget *)t);
-#endif
}
+#else
+#undef e_profile_event_emit
+void e_profile_event_emit(const char *id, const char *uid, guint32 flags);
+
+void
+e_profile_event_emit(const char *id, const char *uid, guint32 flags)
+{
+}
+#endif
/* ********************************************************************** */
diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h
index 3429184f89..dd57d58a82 100644
--- a/e-util/e-profile-event.h
+++ b/e-util/e-profile-event.h
@@ -80,7 +80,12 @@ EProfileEvent *e_profile_event_peek(void);
EProfileEventTarget *e_profile_event_target_new(EProfileEvent *emp, const char *id, const char *uid, guint32 flags);
+/* we don't want ANY rubbish code lying around if we have profiling off */
+#ifdef ENABLE_PROFILING
void e_profile_event_emit(const char *id, const char *uid, guint32 flags);
+#else
+#define e_profile_event_emit(a, b, c)
+#endif
/* ********************************************************************** */