git://git.jankratochvil.net
/
mdsms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version bumped to 1.5.2.
[mdsms.git]
/
mdsms.c
diff --git
a/mdsms.c
b/mdsms.c
index
711aee3
..
21d6999
100644
(file)
--- a/
mdsms.c
+++ b/
mdsms.c
@@
-1,3
+1,4
@@
+#define WANT_DECLARATIONS 1
#include "config.h"
#ifndef lint
static char rcsid[] ATTR_UNUSED = "$Id$";
#include "config.h"
#ifndef lint
static char rcsid[] ATTR_UNUSED = "$Id$";
@@
-69,6
+70,13
@@
static char rcsid[] ATTR_UNUSED = "$Id$";
#include "getopt.h"
#endif
#include "getopt.h"
#endif
+
+/* Always override possible system defintions as it is safe (used by glib) */
+#undef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#undef MIN
+#define MIN(a,b) ((a)<(b)?(a):(b))
+
#define NELEM(x) (sizeof((x))/sizeof(*(x)))
#ifndef DEBUG
#define NELEM(x) (sizeof((x))/sizeof(*(x)))
#ifndef DEBUG
@@
-866,7
+874,7
@@
static const char *record,*recordend;
static char *catchdata;
static size_t catchdatal,catchdatasiz;
static char *catchdata;
static size_t catchdatal,catchdatasiz;
-static char *reform(const char *s,int slot);
+static c
onst c
har *reform(const char *s,int slot);
static void catched(const char *end,char edata)
{
size_t len;
static void catched(const char *end,char edata)
{
size_t len;
@@
-896,7
+904,7
@@
static void retrying(void)
if (verbose>=2) error(_(".Retrying phase, %d out of %ld.."),retrycnt,maxretryn);
}
if (verbose>=2) error(_(".Retrying phase, %d out of %ld.."),retrycnt,maxretryn);
}
-static char *reform(const char *s,int slot)
+static c
onst c
har *reform(const char *s,int slot)
{
static struct formslot {
char *s;
{
static struct formslot {
char *s;
@@
-1514,8
+1522,8
@@
retry:
static char *check_format(const char *fmt,const char *string)
{
static char err[LINE_MAX],sub[50];
static char *check_format(const char *fmt,const char *string)
{
static char err[LINE_MAX],sub[50];
-char
*subp,
cf,cs;
-const char *sf,*ss;
+char cf,cs;
+const char *sf,*ss
,*subp
;
for (sf=fmt,ss=string;(cf=*sf) && (cs=*ss);sf++,ss++) {
subp=NULL;
for (sf=fmt,ss=string;(cf=*sf) && (cs=*ss);sf++,ss++) {
subp=NULL;