Define isnan for imagemagick 6

This commit is contained in:
Linus Dierheimer 2022-04-11 16:32:47 +02:00
parent 64182539aa
commit 82e2790e1b
No known key found for this signature in database
GPG Key ID: 74FA57726CDD7B61
3 changed files with 13 additions and 10 deletions

View File

@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v2
- name: install required packages
run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-6.q16-dev libxfconf-0-dev rpm librpm-dev libzstd-dev
run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev rpm librpm-dev libzstd-dev
- name: Initialize CodeQL
uses: github/codeql-action/init@v1

View File

@ -16,7 +16,7 @@ jobs:
uses: actions/checkout@v2
- name: install required packages
run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-6.q16-dev libxfconf-0-dev rpm librpm-dev libzstd-dev
run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev rpm librpm-dev libzstd-dev
- name: Initialize CodeQL
uses: github/codeql-action/init@v1

View File

@ -5,6 +5,17 @@
#include "fastfetch.h"
#ifdef FF_HAVE_IMAGEMAGICK7
bool ffLogoPrintSixelIM7(FFinstance* instance);
#endif
#ifdef FF_HAVE_IMAGEMAGICK6
#ifndef isnan
#define isnan(x) ((x) != (x))
#endif
bool ffLogoPrintSixelIM6(FFinstance* instance);
#endif
#if defined(FF_HAVE_IMAGEMAGICK7) || defined(FF_HAVE_IMAGEMAGICK6)
#include <sys/ioctl.h>
@ -20,12 +31,4 @@ bool ffLogoPrintSixelImpl(FFinstance* instance, void* library, FFLogoIMResizeFun
#endif
#ifdef FF_HAVE_IMAGEMAGICK7
bool ffLogoPrintSixelIM7(FFinstance* instance);
#endif
#ifdef FF_HAVE_IMAGEMAGICK6
bool ffLogoPrintSixelIM6(FFinstance* instance);
#endif
#endif