summary refs log tree commit diff
path: root/gnu/packages/patches/tvtime-xmltv.patch
blob: 2f4afc6e5afb8b50409bab5d20e710a469691dae (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
Fix compilation error: conflicting types for 'locale_t'.

This is an excerpt from the debian patch ... 
http://http.debian.net/debian/pool/main/t/tvtime/tvtime_1.0.2-14.diff.gz

--- tvtime-1.0.2.orig/src/xmltv.c
+++ tvtime-1.0.2/src/xmltv.c
@@ -118,9 +118,9 @@
 typedef struct {
     const char *code;
     const char *name;
-} locale_t;
+} tvtime_locale_t;
 
-static locale_t locale_table[] = {
+static tvtime_locale_t locale_table[] = {
     {"AA", "Afar"},           {"AB", "Abkhazian"},      {"AF", "Afrikaans"},
     {"AM", "Amharic"},        {"AR", "Arabic"},         {"AS", "Assamese"},
     {"AY", "Aymara"},         {"AZ", "Azerbaijani"},    {"BA", "Bashkir"},
@@ -168,7 +168,7 @@
     {"XH", "Xhosa"},          {"YO", "Yoruba"},         {"ZH", "Chinese"},
     {"ZU", "Zulu"} };
 
-const int num_locales = sizeof( locale_table ) / sizeof( locale_t );
+const int num_locales = sizeof( locale_table ) / sizeof( tvtime_locale_t );
 
 /**
  * Timezone parsing code based loosely on the algorithm in