aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2022-12-05 12:50:44 +0900
committerMartin Schanzenbach <schanzen@gnunet.org>2022-12-05 12:50:44 +0900
commite5063df3ca6099beec7b160f47bec9465590ac74 (patch)
treeb4daf6542103cc883970c3d29d16fa74f0df7866
parenta334dce8e8d0fb5603a9d7449d1765f7291693cd (diff)
downloadgnunet-gtk-e5063df3ca6099beec7b160f47bec9465590ac74.tar.gz
gnunet-gtk-e5063df3ca6099beec7b160f47bec9465590ac74.zip
-remove platform.h dependency
-rw-r--r--src/fs/gnunet-fs-gtk.h2
-rw-r--r--src/include/gettext.h72
-rw-r--r--src/include/gnunet_gtk.h10
-rw-r--r--src/setup/gnunet-setup.h2
-rw-r--r--src/statistics/functions.c1
-rw-r--r--src/statistics/statistics.c1
6 files changed, 83 insertions, 5 deletions
diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h
index 5fb46ddf..4a323459 100644
--- a/src/fs/gnunet-fs-gtk.h
+++ b/src/fs/gnunet-fs-gtk.h
@@ -34,7 +34,7 @@
34#if HAVE_EXTRACTOR_H 34#if HAVE_EXTRACTOR_H
35#include <extractor.h> 35#include <extractor.h>
36#endif 36#endif
37 37#include <sys/stat.h>
38 38
39/** 39/**
40 * Context for a GNS lookup for starting a search. 40 * Context for a GNS lookup for starting a search.
diff --git a/src/include/gettext.h b/src/include/gettext.h
new file mode 100644
index 00000000..6e98f197
--- /dev/null
+++ b/src/include/gettext.h
@@ -0,0 +1,72 @@
1/* Convenience header for conditional use of GNU <libintl.h>.
2 Copyright Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
3
4 This program is free software; you can redistribute it and/or modify it
5 under the terms of the GNU Library General Public License as published
6 by the Free Software Foundation; either version 3, or (at your option)
7 any later version.
8
9 This program is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 Library General Public License for more details.
13
14 You should have received a copy of the GNU Library General Public
15 License along with this program; if not, write to the Free Software
16 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
17 USA. */
18
19#ifndef _LIBGETTEXT_H
20#define _LIBGETTEXT_H 1
21
22/* NLS can be disabled through the configure --disable-nls option. */
23#if ENABLE_NLS
24
25/* Get declarations of GNU message catalog functions. */
26
27#include <libintl.h>
28
29#else
30
31/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
32 chokes if dcgettext is defined as a macro. So include it now, to make
33 later inclusions of <locale.h> a NOP. We don't include <libintl.h>
34 as well because people using "gettext.h" will not include <libintl.h>,
35 and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
36 is GNUNET_OK. */
37#if defined(__sun)
38#include <locale.h>
39#endif
40
41/* Disabled NLS.
42 The casts to 'const char *' serve the purpose of producing warnings
43 for invalid uses of the value returned from these functions.
44 On pre-ANSI systems without 'const', the config.h file is supposed to
45 contain "#define const". */
46#define gettext(Msgid) ((const char *) (Msgid))
47#define dgettext(Domainname, Msgid) ((const char *) (Msgid))
48#define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
49#define ngettext(Msgid1, Msgid2, N) \
50 ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
51#define dngettext(Domainname, Msgid1, Msgid2, N) \
52 ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
53#define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
54 ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
55/* slight modification here to avoid warnings: generate GNUNET_NO code,
56 not even the cast... */
57#define textdomain(Domainname)
58#define bindtextdomain(Domainname, Dirname)
59#define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
60
61#endif
62
63/* A pseudo function call that serves as a marker for the automated
64 extraction of messages, but does not call gettext(). The run-time
65 translation is done at a different place in the code.
66 The argument, String, should be a literal string. Concatenated strings
67 and other string expressions won't work.
68 The macro's expansion is not parenthesized, so that it is suitable as
69 initializer for static 'char[]' or 'const char[]' variables. */
70#define gettext_noop(String) String
71
72#endif /* _LIBGETTEXT_H */
diff --git a/src/include/gnunet_gtk.h b/src/include/gnunet_gtk.h
index a2fdb67e..d495f5c2 100644
--- a/src/include/gnunet_gtk.h
+++ b/src/include/gnunet_gtk.h
@@ -33,13 +33,13 @@
33#endif 33#endif
34#endif 34#endif
35 35
36#include <gnunet/platform.h>
37#include <gnunet/gnunet_util_lib.h> 36#include <gnunet/gnunet_util_lib.h>
38#include <gnunet/gnunet_extractor_compat.h> 37#include <gnunet/gnunet_extractor_compat.h>
39#include <gnunet/gnunet_fs_service.h> 38#include <gnunet/gnunet_fs_service.h>
40#include <gtk/gtk.h> 39#include <gtk/gtk.h>
41#include <gladeui/glade.h> 40#include <gladeui/glade.h>
42#include <gdk/gdkkeysyms.h> 41#include <gdk/gdkkeysyms.h>
42#include "gettext.h"
43#ifndef GDK_KEY_Return 43#ifndef GDK_KEY_Return
44#define GDK_KEY_Return GDK_Return 44#define GDK_KEY_Return GDK_Return
45#endif 45#endif
@@ -47,6 +47,13 @@
47#define GDK_KEY_Delete GDK_Delete 47#define GDK_KEY_Delete GDK_Delete
48#endif 48#endif
49 49
50#define _(String) dgettext (PACKAGE, String)
51
52#define DIR_SEPARATOR_STR "/"
53
54#define DIR_SEPARATOR '/'
55
56
50/** 57/**
51 * Handle for our main loop. 58 * Handle for our main loop.
52 */ 59 */
@@ -439,5 +446,6 @@ GNUNET_GTK_get_selected_anonymity_combo_level (GtkComboBox *combo,
439 guint *p_level); 446 guint *p_level);
440 447
441 448
449
442#endif 450#endif
443/* end of gnunet_gtk.h */ 451/* end of gnunet_gtk.h */
diff --git a/src/setup/gnunet-setup.h b/src/setup/gnunet-setup.h
index c4f54f1c..c59acd1f 100644
--- a/src/setup/gnunet-setup.h
+++ b/src/setup/gnunet-setup.h
@@ -30,7 +30,7 @@
30#include <gnunet/gnunet_util_lib.h> 30#include <gnunet/gnunet_util_lib.h>
31#include <gladeui/glade.h> 31#include <gladeui/glade.h>
32#include <gtk/gtk.h> 32#include <gtk/gtk.h>
33 33#include <pwd.h>
34 34
35/** 35/**
36 * Name of the configuration file. 36 * Name of the configuration file.
diff --git a/src/statistics/functions.c b/src/statistics/functions.c
index ca265b53..9ca97b67 100644
--- a/src/statistics/functions.c
+++ b/src/statistics/functions.c
@@ -19,7 +19,6 @@
19 19
20*/ 20*/
21 21
22#include "platform.h"
23#include "gnunetgtk_common.h" 22#include "gnunetgtk_common.h"
24#include <GNUnet/gnunet_util_cron.h> 23#include <GNUnet/gnunet_util_cron.h>
25#include <GNUnet/gnunet_stats_lib.h> 24#include <GNUnet/gnunet_stats_lib.h>
diff --git a/src/statistics/statistics.c b/src/statistics/statistics.c
index ddab959f..f4f4df9d 100644
--- a/src/statistics/statistics.c
+++ b/src/statistics/statistics.c
@@ -21,7 +21,6 @@
21 gnome-system-monitor v2.0.5, Copyright (C) 2001 Kevin Vandersloot 21 gnome-system-monitor v2.0.5, Copyright (C) 2001 Kevin Vandersloot
22*/ 22*/
23 23
24#include "platform.h"
25#include "gnunetgtk_common.h" 24#include "gnunetgtk_common.h"
26#include <GNUnet/gnunet_stats_lib.h> 25#include <GNUnet/gnunet_stats_lib.h>
27#include <GNUnet/gnunet_getoption_lib.h> 26#include <GNUnet/gnunet_getoption_lib.h>