localized/util/merge.h: include string.h and fix up some warnings

This commit is contained in:
Jon Trulson
2014-03-22 19:06:54 -06:00
parent 4568a22f99
commit 23d2ba3445

View File

@@ -93,6 +93,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <locale.h> #include <locale.h>
#include <nl_types.h> #include <nl_types.h>
@@ -310,17 +311,20 @@ int file; /* 0: Primary message file, 1: Default message file */
/* /*
* Display error message and exit program. * Display error message and exit program.
*
* file == file in which the error found 0: Primary message file
* 1: Default message file
* 2: Template file
* 9: N/A
*/ */
void fatal (m, line, file) void fatal (char *m, int line, int file)
char *m; /* file in which the error found 0: Primary message file */
int line; /* line where the error found */
int file; /* file in which the error found 0: Primary message file */
/* 1: Default message file */ /* 1: Default message file */
/* 2: Template file */ /* 2: Template file */
/* 9: N/A */ /* 9: N/A */
{ {
fprintf (stderr, "*** Fatal: "); fprintf (stderr, "*** Fatal: ");
fprintf (stderr, m); fprintf (stderr, "%s", m);
switch(file) switch(file)
{ {
case 0: case 0: