diff options
| author | Stef Walter <stefw@gnome.org> | 2012-06-29 16:10:47 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2012-06-29 16:10:47 +0200 |
| commit | da2606bfbbdbd36d5e42bf2acf614735dfc515d2 (patch) | |
| tree | 18b0ce3d3531b00c1f7be217a5da07e5218c7547 /common | |
| parent | 89602ce99feb7e8c5a37634c3f577532f82eddbd (diff) | |
Win32 build fixes
* Remove unused functions
* Use getprogname() instead of calc_progname() which no longer exists
* Fix up exporting of functions in the mock module
Diffstat (limited to 'common')
| -rw-r--r-- | common/compat.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/common/compat.c b/common/compat.c index 4c8016b..e1f7532 100644 --- a/common/compat.c +++ b/common/compat.c @@ -36,6 +36,9 @@ #include "compat.h" +#include <stdlib.h> +#include <string.h> + #ifndef HAVE_GETPROGNAME #ifdef OS_UNIX @@ -166,7 +169,7 @@ verrc (int eval, { if (err_file == 0) err_set_file((FILE *)0); - fprintf(err_file, "%s: ", calc_prog_name()); + fprintf(err_file, "%s: ", getprogname ()); if (fmt != NULL) { vfprintf(err_file, fmt, ap); fprintf(err_file, ": "); @@ -193,7 +196,7 @@ verrx (int eval, { if (err_file == 0) err_set_file((FILE *)0); - fprintf(err_file, "%s: ", calc_prog_name()); + fprintf(err_file, "%s: ", getprogname ()); if (fmt != NULL) vfprintf(err_file, fmt, ap); fprintf(err_file, "\n"); @@ -235,7 +238,7 @@ vwarnc (int code, { if (err_file == 0) err_set_file((FILE *)0); - fprintf(err_file, "%s: ", calc_prog_name()); + fprintf(err_file, "%s: ", getprogname ()); if (fmt != NULL) { vfprintf(err_file, fmt, ap); @@ -260,7 +263,7 @@ vwarnx (const char *fmt, { if(err_file == 0) err_set_file((FILE*)0); - fprintf(err_file, "%s: ", calc_prog_name()); + fprintf(err_file, "%s: ", getprogname ()); if(fmt != NULL) vfprintf(err_file, fmt, ap); fprintf(err_file, "\n"); |