[Git][ftp-team/dak][master] 3 commits: [dsync] Drop GNU MIN/MAX definition

10119163

by Jochen Sprickerhof at 2020-03-29T11:25:19+02:00

[dsync] Drop GNU MIN/MAX definition

Seems like operators have been dropped from GNU C++

f06c66a8
by Jochen Sprickerhof at 2020-03-29T11:25:51+02:00
```
[dsync] Add missing string.h for strlen
```

46d727f6

by Joerg Jaspert at 2020-04-10T23:05:05+02:00

Merge branch 'fix_dsync'

* fix_dsync:
  [dsync] Add missing string.h for strlen
  [dsync] Drop GNU MIN/MAX definition

@@ -12,6 +12,7 @@
  #include <stdlib.h>
  #include <sys/stat.h>
  #include <dsync/error.h>
 +#include <string.h>
  // SimplifyPath - Short function to remove relative path components	/*{{{*/
  // ---------------------------------------------------------------------

@@ -28,6 +28,7 @@
  #include <signal.h>
  #include <wait.h>
  #include <errno.h>
 +#include <string.h>
  #include <iostream>
  using namespace std;

@@ -28,6 +28,7 @@
  #endif
  #include <string>
 +#include <string.h>
  using namespace std;
  class MD5Summation;

@@ -33,6 +33,7 @@
  #include <sys/stat.h>
  #include <unistd.h>
  #include <fcntl.h>
 +#include <string.h>
     									/*}}}*/
  // MMap::MMap - Constructor						/*{{{*/

@@ -24,6 +24,7 @@
  #include <string>
  #include <vector>
  #include <time.h>
 +#include <string.h>
  using namespace std;

@@ -24,12 +24,6 @@
  #define MAX(x,y) _max(x,y)
  #endif
 -// GNU C++ has a min/max operator <coolio>
 -#if defined(__GNUG__)
 -#define MIN(A,B) ((A) <? (B))
 -#define MAX(A,B) ((A) >? (B))
 -#endif
+-
  /* Templates tend to mess up existing code that uses min/max because of the
     strict matching requirements */
  #if !defined(MIN)

@@ -23,6 +23,7 @@
  #include <dsync/error.h>
  #include <fnmatch.h>
 +#include <string.h>
  using namespace std;
  									/*}}}*/

@@ -22,6 +22,7 @@
  #include <time.h>
  #include <stdio.h>
 +#include <string.h>
  #include <iostream>
  using namespace std;
  									/*}}}*/

@@ -16,6 +16,7 @@
  #include <dsync/filelistdb.h>
  #include <dsync/error.h>
 +#include <string.h>
  									/*}}}*/
  // FileListDB::dsFileListDB - Constructor				/*{{{*/