c987560802
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
14 lines
437 B
Diff
14 lines
437 B
Diff
Do not try to redefine INT64_MAX, if it is already defined.
|
|
|
|
--- a/src/celutil/basictypes.h 2011-06-05 18:11:15.000000000 +0200
|
|
+++ b/src/celutil/basictypes.h 2016-09-02 17:41:33.335187908 +0200
|
|
@@ -31,7 +31,9 @@
|
|
#include <limits>
|
|
typedef int64_t int64;
|
|
typedef uint64_t uint64;
|
|
+#ifndef INT64_MAX
|
|
#define INT64_MAX 9223372036854775807LL
|
|
+#endif
|
|
#ifndef UINT64_MAX
|
|
#define UINT64_MAX 0xffffffffffffffffULL
|
|
#endif
|