diff options
| author | oscar <oscar@qcore> | 2015-05-14 22:27:55 +0200 |
|---|---|---|
| committer | oscar <oscar@qcore> | 2015-05-14 22:27:55 +0200 |
| commit | b1aff9dd250cbb2c8f48f8016faaafc0915b0967 (patch) | |
| tree | e230fef5d83c203f3bbf9a8c8215310edd666774 /server/epdfinfo.h | |
| parent | e9ee3090d8048b16f4262f82926fca05a1692f27 (diff) | |
| parent | 8daeccba8a4a49e5f7f57693932413431ed85aaf (diff) | |
Merge branch 'master' into options
Conflicts:
lisp/pdf-info.el
server/epdfinfo.c
server/epdfinfo.h
Diffstat (limited to 'server/epdfinfo.h')
| -rw-r--r-- | server/epdfinfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/epdfinfo.h b/server/epdfinfo.h index f1b2a40..d602742 100644 --- a/server/epdfinfo.h +++ b/server/epdfinfo.h @@ -99,7 +99,7 @@ # define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf) #endif -#if (defined (__APPLE__) || defined (__CYGWIN__)) +#ifndef HAVE_ERROR_H # define error(status, errno, fmt, args...) \ do { \ int error = (errno); \ |