Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config.h globals cleanup.

This commit is contained in:
Enno Rehling 2016-11-17 22:10:41 +01:00
parent cb6be542b9
commit dc2452e2c1
5 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/kernel/config.h
View File

@ -155,7 +155,6 @@ struct param;
void free_config(void);
extern const char *parameters[];
extern const char *localenames[];
extern settings global;
extern bool lomem; /* save memory */

1
src/triggers/changefaction.c
View File

@ -17,7 +17,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**/
#include <platform.h>
#include <kernel/config.h>
#include "changefaction.h"
/* kernel includes */

1
src/triggers/changerace.c
View File

@ -17,7 +17,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**/
#include <platform.h>
#include <kernel/config.h>
#include "changerace.h"
/* kernel includes */

1
src/triggers/clonedied.c
View File

@ -17,7 +17,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**/
#include <platform.h>
#include <kernel/config.h>
#include "clonedied.h"
#include "magic.h"

29
src/util/language.h
View File

@ -30,33 +30,34 @@ extern "C" {
struct locale;
struct critbit_tree;
extern const char *localenames[];
extern struct locale *default_locale;
extern struct locale *locales;
extern struct locale *nextlocale(const struct locale *lang);
/** managing multiple locales: **/
extern struct locale *get_locale(const char *name);
extern struct locale *get_or_create_locale(const char *key);
struct locale *get_locale(const char *name);
struct locale *get_or_create_locale(const char *key);
void init_locales(void);
void free_locales(void);
void reset_locales(void);
/** operations on locales: **/
extern void locale_setstring(struct locale *lang, const char *key,
void locale_setstring(struct locale *lang, const char *key,
const char *value);
extern const char *locale_getstring(const struct locale *lang,
const char *locale_getstring(const struct locale *lang,
const char *key);
extern const char *locale_string(const struct locale *lang, const char *key, bool warn); /* does fallback */
extern unsigned int locale_index(const struct locale *lang);
extern const char *locale_name(const struct locale *lang);
const char *locale_string(const struct locale *lang, const char *key, bool warn); /* does fallback */
unsigned int locale_index(const struct locale *lang);
const char *locale_name(const struct locale *lang);
extern const char *mkname(const char *namespc, const char *key);
extern char *mkname_buf(const char *namespc, const char *key, char *buffer);
const char *mkname(const char *namespc, const char *key);
char *mkname_buf(const char *namespc, const char *key, char *buffer);
extern void make_locales(const char *str);
void make_locales(const char *str);
#define LOC(lang, s) (lang?locale_string(lang, s, true):s)
extern struct locale *default_locale;
extern struct locale *locales;
extern struct locale *nextlocale(const struct locale *lang);
enum {
UT_PARAMS,
UT_KEYWORDS,