Commit f3e3eb0b authored by Martyn James Russell's avatar Martyn James Russell

Fixed the #defines for these headers so they don't possibly conflict with

	* src/libtracker-common/tracker-dbus.[ch]:
	* src/libtracker-common/tracker-field.h:
	* src/libtracker-common/tracker-ontology.h:
	* src/libtracker-common/tracker-parser.h:
	* src/libtracker-common/tracker-service.h: Fixed the #defines for
	these headers so they don't possibly conflict with same name
	headers in the future.

svn path=/trunk/; revision=2948
parent 360b10f8
2009-02-20 Martyn Russell <martyn@imendio.com>
* src/libtracker-common/tracker-dbus.[ch]:
* src/libtracker-common/tracker-field.h:
* src/libtracker-common/tracker-ontology.h:
* src/libtracker-common/tracker-parser.h:
* src/libtracker-common/tracker-service.h: Fixed the #defines for
these headers so they don't possibly conflict with same name
headers in the future.
2009-02-19 Mikael Ottela <mikael.ottela@ixonos.com>
* src/tracker-extract/tracker-extract-jpeg.c: Error handling
......
......@@ -19,10 +19,10 @@
* Boston, MA 02110-1301, USA.
*/
#include "tracker-dbus.h"
#include <gio/gio.h>
#include "tracker-dbus.h"
struct TrackerDBusRequestHandler {
TrackerDBusRequestFunc new;
TrackerDBusRequestFunc done;
......
......@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __LIBTRACKER_DBUS_H__
#define __LIBTRACKER_DBUS_H__
#ifndef __LIBTRACKER_COMMON_DBUS_H__
#define __LIBTRACKER_COMMON_DBUS_H__
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
#error "only <libtracker-common/tracker-common.h> must be included directly."
......@@ -123,4 +123,4 @@ void tracker_dbus_request_debug (gint request_id,
G_END_DECLS
#endif /* __LIBTRACKER_DBUS_H__ */
#endif /* __LIBTRACKER_COMMON_DBUS_H__ */
......@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __TRACKERD_FIELD_H__
#define __TRACKERD_FIELD_H__
#ifndef __LIBTRACKER_COMMON_FIELD_H__
#define __LIBTRACKER_COMMON_FIELD_H__
#include <glib-object.h>
......@@ -112,5 +112,5 @@ void tracker_field_append_child_id (TrackerField *field,
G_END_DECLS
#endif /* __TRACKERD_FIELD_H__ */
#endif /* __LIBTRACKER_COMMON_FIELD_H__ */
......@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __TRACKERD_ONTOLOGY_H__
#define __TRACKERD_ONTOLOGY_H__
#ifndef __LIBTRACKER_COMMON_ONTOLOGY_H__
#define __LIBTRACKER_COMMON_ONTOLOGY_H__
#include <glib-object.h>
......@@ -81,5 +81,5 @@ gboolean tracker_ontology_field_is_child_of (const gchar *child,
G_END_DECLS
#endif /* __TRACKERD_ONTOLOGY_H__ */
#endif /* __LIBTRACKER_COMMON_ONTOLOGY_H__ */
......@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __TRACKERD_PARSER_H__
#define __TRACKERD_PARSER_H__
#ifndef __LIBTRACKER_TRACKER_COMMON_PARSER_H__
#define __LIBTRACKER_TRACKER_COMMON_PARSER_H__
#include <glib.h>
......
......@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __TRACKERD_SERVICES_H__
#define __TRACKERD_SERVICES_H__
#ifndef __LIBTRACKER_COMMON_SERVICES_H__
#define __LIBTRACKER_COMMON_SERVICES_H__
#include <glib-object.h>
......@@ -116,5 +116,5 @@ void tracker_service_set_show_service_directories (TrackerService *service,
G_END_DECLS
#endif /* __TRACKERD_SERVICE_H__ */
#endif /* __LIBTRACKER_COMMON_SERVICE_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment