From 6dc1dc5620c653d17d467d129c64dad94f8f82ac Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 25 Nov 2005 14:32:54 +0000 Subject: Sort the stuff in the Win32 part for clarity. Add some new run-time 2005-11-25 Tor Lillqvist * e-util-private.h: Sort the stuff in the Win32 part for clarity. Add some new run-time overrides for compile-time paths. Include fcntl.h and define O_BINARY as zero if not defined (on Unix). * e-win32-reloc.c: Sort here, too, and add the implementation for the new run-time overrides. * Makefile.am: Ditto here. Link with INTLLIBS. svn path=/trunk/; revision=30670 --- e-util/e-util-private.h | 92 ++++++++++++++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 35 deletions(-) (limited to 'e-util/e-util-private.h') diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h index 5f68341d4a..f40b09f674 100644 --- a/e-util/e-util-private.h +++ b/e-util/e-util-private.h @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-util-private.h + * e-util-private.h: Private functions for Evolution (not just for libeutil) * Copyright 2005, Novell, Inc. * * Authors: @@ -24,45 +24,67 @@ #ifndef _E_UTIL_PRIVATE_H_ #define _E_UTIL_PRIVATE_H_ +#include #include +#ifndef O_BINARY +#define O_BINARY 0 +#endif + #ifdef G_OS_WIN32 -const char *_e_get_localedir (void) G_GNUC_CONST; -const char *_e_get_prefix (void) G_GNUC_CONST; -const char *_e_get_sysconfdir (void) G_GNUC_CONST; +int fsync (int fd); + +const char *_e_get_category_icons (void) G_GNUC_CONST; const char *_e_get_datadir (void) G_GNUC_CONST; -const char *_e_get_libdir (void) G_GNUC_CONST; +const char *_e_get_ecpsdir (void) G_GNUC_CONST; +const char *_e_get_etspecdir (void) G_GNUC_CONST; +const char *_e_get_galviewsdir (void) G_GNUC_CONST; const char *_e_get_gladedir (void) G_GNUC_CONST; const char *_e_get_helpdir (void) G_GNUC_CONST; -const char *_e_get_etspecdir (void) G_GNUC_CONST; -const char *_e_get_imagesdir (void) G_GNUC_CONST; const char *_e_get_iconsdir (void) G_GNUC_CONST; -const char *_e_get_category_icons (void) G_GNUC_CONST; +const char *_e_get_imagesdir (void) G_GNUC_CONST; +const char *_e_get_libdir (void) G_GNUC_CONST; +const char *_e_get_libexecdir (void) G_GNUC_CONST; +const char *_e_get_localedir (void) G_GNUC_CONST; const char *_e_get_plugindir (void) G_GNUC_CONST; +const char *_e_get_prefix (void) G_GNUC_CONST; const char *_e_get_privdatadir (void) G_GNUC_CONST; const char *_e_get_search_rule_dir (void) G_GNUC_CONST; -const char *_e_get_galviewsdir (void) G_GNUC_CONST; -const char *_e_get_libexecdir (void) G_GNUC_CONST; const char *_e_get_sounddir (void) G_GNUC_CONST; +const char *_e_get_sysconfdir (void) G_GNUC_CONST; +const char *_e_get_toolsdir (void) G_GNUC_CONST; +const char *_e_get_uidir (void) G_GNUC_CONST; -#undef EVOLUTION_LOCALEDIR -#define EVOLUTION_LOCALEDIR _e_get_localedir () +#undef DATADIR +#define DATADIR _e_get_datadir () -#undef PREFIX -#define PREFIX _e_get_prefix () +#undef LIBDIR +#define LIBDIR _e_get_libdir () #undef SYSCONFDIR #define SYSCONFDIR _e_get_sysconfdir () -#undef DATADIR -#define DATADIR _e_get_datadir () +#undef PREFIX +#define PREFIX _e_get_prefix () + +#undef EVOLUTION_CATEGORY_ICONS +#define EVOLUTION_CATEGORY_ICONS _e_get_category_icons () #undef EVOLUTION_DATADIR #define EVOLUTION_DATADIR _e_get_datadir () -#undef LIBDIR -#define LIBDIR _e_get_libdir () +#undef EVOLUTION_ECPSDIR +#define EVOLUTION_ECPSDIR _e_get_ecpsdir () + +#undef EVOLUTION_ETSPECDIR +#define EVOLUTION_ETSPECDIR _e_get_etspecdir () + +#undef EVOLUTION_LOCALEDIR +#define EVOLUTION_LOCALEDIR _e_get_localedir () + +#undef EVOLUTION_GALVIEWSDIR +#define EVOLUTION_GALVIEWSDIR _e_get_galviewsdir () #undef EVOLUTION_GLADEDIR #define EVOLUTION_GLADEDIR _e_get_gladedir () @@ -70,20 +92,17 @@ const char *_e_get_sounddir (void) G_GNUC_CONST; #undef EVOLUTION_HELPDIR #define EVOLUTION_HELPDIR _e_get_helpdir () -#undef EVOLUTION_ETSPECDIR -#define EVOLUTION_ETSPECDIR _e_get_etspecdir () - -#undef EVOLUTION_IMAGESDIR -#define EVOLUTION_IMAGESDIR _e_get_imagesdir () +#undef EVOLUTION_ICONSDIR +#define EVOLUTION_ICONSDIR _e_get_iconsdir () #undef EVOLUTION_IMAGES #define EVOLUTION_IMAGES EVOLUTION_IMAGESDIR -#undef EVOLUTION_ICONSDIR -#define EVOLUTION_ICONSDIR _e_get_iconsdir () +#undef EVOLUTION_IMAGESDIR +#define EVOLUTION_IMAGESDIR _e_get_imagesdir () -#undef EVOLUTION_CATEGORY_ICONS -#define EVOLUTION_CATEGORY_ICONS _e_get_category_icons () +#undef EVOLUTION_LIBEXECDIR +#define EVOLUTION_LIBEXECDIR _e_get_libexecdir () #undef EVOLUTION_PLUGINDIR #define EVOLUTION_PLUGINDIR _e_get_plugindir () @@ -91,17 +110,20 @@ const char *_e_get_sounddir (void) G_GNUC_CONST; #undef EVOLUTION_PRIVDATADIR #define EVOLUTION_PRIVDATADIR _e_get_privdatadir () -#undef SEARCH_RULE_DIR -#define SEARCH_RULE_DIR _e_get_search_rule_dir () +#undef EVOLUTION_SOUNDDIR +#define EVOLUTION_SOUNDDIR _e_get_sounddir () -#undef EVOLUTION_GALVIEWSDIR -#define EVOLUTION_GALVIEWSDIR _e_get_galviewsdir () +#undef EVOLUTION_SYSCONFDIR +#define EVOLUTION_SYSCONFDIR _e_get_sysconfdir () -#undef EVOLUTION_LIBEXECDIR -#define EVOLUTION_LIBEXECDIR _e_get_libexecdir () +#undef EVOLUTION_TOOLSDIR +#define EVOLUTION_TOOLSDIR _e_get_toolsdir () -#undef EVOLUTION_SOUNDDIR -#define EVOLUTION_SOUNDDIR _e_get_sounddir () +#undef EVOLUTION_UIDIR +#define EVOLUTION_UIDIR _e_get_uidir () + +#undef SEARCH_RULE_DIR +#define SEARCH_RULE_DIR _e_get_search_rule_dir () #endif /* G_OS_WIN32 */ -- cgit v1.2.3