diff options
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 |