diff options
Diffstat (limited to 'converter')
| -rw-r--r-- | converter/other/Makefile | 2 | ||||
| -rw-r--r-- | converter/other/jpeg2000/libjasper/Makefile | 2 | ||||
| -rw-r--r-- | converter/other/svgtopam.c | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/converter/other/Makefile b/converter/other/Makefile index 756ba8e3..8d4fcb76 100644 --- a/converter/other/Makefile +++ b/converter/other/Makefile @@ -215,7 +215,7 @@ install.bin.local: $(PKGDIR)/bin # Remember that $(SYMLINK) might just be a copy command. # backward compatibility: program used to be named pnmnoraw cd $(PKGDIR)/bin ; \ - $(SYMLINK) pnmtoplainpnm$(EXE) pnmnoraw + $(SYMLINK) pnmtoplainpnm pnmnoraw # backward compatibility: program used to be gemtopbm cd $(PKGDIR)/bin ; \ $(SYMLINK) gemtopnm$(EXE) gemtopbm diff --git a/converter/other/jpeg2000/libjasper/Makefile b/converter/other/jpeg2000/libjasper/Makefile index ad4fbd8f..965f15ad 100644 --- a/converter/other/jpeg2000/libjasper/Makefile +++ b/converter/other/jpeg2000/libjasper/Makefile @@ -25,6 +25,6 @@ include $(SRCDIR)/$(SUBDIR)/Makefile.common # looks like dependencies were rebuilt and libjasper.a gets rebuilt every # time. libjasper.a: $(SUBDIRS:%=%/all) partlist - ar rc $@ $(shell cat partlist) + $(AR) rc $@ $(shell cat partlist) $(RANLIB) $@ diff --git a/converter/other/svgtopam.c b/converter/other/svgtopam.c index a2fe9f9d..76e122db 100644 --- a/converter/other/svgtopam.c +++ b/converter/other/svgtopam.c @@ -189,13 +189,13 @@ destroyPath(path * const pathP) { typedef struct { - uint x; - uint y; + unsigned int x; + unsigned int y; } point; static point -makePoint(uint const x, - uint const y) { +makePoint(unsigned int const x, + unsigned int const y) { point p; @@ -296,8 +296,8 @@ skipWhiteSpace(pathReader * const pathReaderP) { static void -getNumber(pathReader * const pathReaderP, - uint * const numberP) { +getNumber(pathReader * const pathReaderP, + unsigned int * const numberP) { const path * const pathP = pathReaderP->pathP; const char * const pathText = pathP->pathText; @@ -308,7 +308,7 @@ getNumber(pathReader * const pathReaderP, if (pathReaderP->cursor >= pathTextLength) pm_error("Path description ends where a number was expected."); else { - uint number; + unsigned int number; number = 0; /* initial value */ |