diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-28 16:25:32 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-28 16:25:32 -0200 |
| commit | f160a71e9501a9d650fd99e9a080970bfd520abb (patch) | |
| tree | 9e061d96d292b42e42984baf6be22a23b07c92f2 /src | |
| parent | 90f2dfbc40d6fa72213f508b0dd85f00965b6194 (diff) | |
| download | xorg-lib-libfontenc-f160a71e9501a9d650fd99e9a080970bfd520abb.tar.gz | |
Janitor: Correct make distcheck and compiler warnings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/.gitignore | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fontenc.c | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 05b61a7..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -*.lo -libfontenc.la -Makefile -Makefile.in diff --git a/src/Makefile.am b/src/Makefile.am index 3c6c3f6..8cd0911 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,6 +5,8 @@ libfontenc_la_SOURCES = \ fontenc.c \ fontencI.h +AM_CFLAGS = @FONTENC_CFLAGS@ + FONTENCDIR=@ENCODINGSDIR@ FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\" diff --git a/src/fontenc.c b/src/fontenc.c index 955e481..923e35e 100644 --- a/src/fontenc.c +++ b/src/fontenc.c @@ -630,8 +630,8 @@ FontEncFromXLFD(const char *name, int length) } /* now p either is null or points at the '-' before the charset registry */ - - if(p == 0) + + if(p == NULL) return NULL; len = length - (p - name) - 1; |