diff options
| author | Oliver Sander <oliver.sander@tu-dresden.de> | 2018-11-30 18:18:13 +0100 |
|---|---|---|
| committer | Albert Astals Cid <tsdgeos@yahoo.es> | 2018-12-06 17:31:41 +0000 |
| commit | cc51c2183cba19e84d2a7e2dddc0278418264357 (patch) | |
| tree | 6548a0698d6a086a13d51a3f39dc12dd1f7888cf /goo | |
| parent | 22053d55a26baf856a0b95552875e748dd1fb849 (diff) | |
Replace Gulong by unsigned long
Diffstat (limited to 'goo')
| -rw-r--r-- | goo/GooString.cc | 4 | ||||
| -rw-r--r-- | goo/gtypes.h | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/goo/GooString.cc b/goo/GooString.cc index 75ed8f29..1fb622be 100644 --- a/goo/GooString.cc +++ b/goo/GooString.cc @@ -56,7 +56,7 @@ union GooStringFormatArg { int i; unsigned int ui; long l; - Gulong ul; + unsigned long ul; long long ll; unsigned long long ull; double f; @@ -293,7 +293,7 @@ GooString *GooString::appendfv(const char *fmt, va_list argList) { case fmtULongHexUpper: case fmtULongOctal: case fmtULongBinary: - args[argsLen].ul = va_arg(argList, Gulong); + args[argsLen].ul = va_arg(argList, unsigned long); break; case fmtLongLongDecimal: case fmtLongLongHex: diff --git a/goo/gtypes.h b/goo/gtypes.h index cc4d2cb1..be166a61 100644 --- a/goo/gtypes.h +++ b/goo/gtypes.h @@ -27,10 +27,5 @@ #include "poppler-config.h" -/* - * These have stupid names to avoid conflicts with <sys/types.h>, - * which on various systems defines some random subset of these. - */ -typedef unsigned long Gulong; #endif |