mirror of
https://github.com/fastfetch-cli/fastfetch.git
synced 2026-11-07 21:50:08 +01:00
Global: unifies FF_STR macro
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
#include "common/io.h"
|
||||
#include "common/properties.h"
|
||||
#include "common/memrchr.h"
|
||||
#include "common/strutil.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#ifdef __FreeBSD__
|
||||
@@ -22,9 +23,6 @@
|
||||
#include "fastfetch_amdgpuids.c.inc"
|
||||
#endif
|
||||
|
||||
#define FF_STR_INDIR(x) #x
|
||||
#define FF_STR(x) FF_STR_INDIR(x)
|
||||
|
||||
static const FFstrbuf* loadPciIds() {
|
||||
static FFstrbuf pciids;
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#include "libc.h"
|
||||
|
||||
#define FF_STR_INDIR(x) #x
|
||||
#define FF_STR(x) FF_STR_INDIR(x)
|
||||
#include "common/strutil.h"
|
||||
|
||||
#include <features.h>
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#include "libc.h"
|
||||
|
||||
#define FF_STR_INDIR(x) #x
|
||||
#define FF_STR(x) FF_STR_INDIR(x)
|
||||
#include "common/strutil.h"
|
||||
|
||||
#include <features.h>
|
||||
|
||||
|
||||
@@ -8,9 +8,6 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#define FF_STR_INDIR(x) #x
|
||||
#define FF_STR(x) FF_STR_INDIR(x)
|
||||
|
||||
static bool parseLsbRelease(const char* fileName, FFOSResult* result) {
|
||||
return ffParsePropFileValues(fileName, 4, (FFpropquery[]) {
|
||||
{ "DISTRIB_ID =", &result->id },
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "version.h"
|
||||
#include "common/strutil.h"
|
||||
|
||||
#if defined(__x86_64__)
|
||||
#define FF_ARCHITECTURE "x86_64"
|
||||
@@ -62,9 +63,6 @@
|
||||
#define FF_SYSNAME "Unknown"
|
||||
#endif
|
||||
|
||||
#define FF_STR_INDIR(x) #x
|
||||
#define FF_STR(x) FF_STR_INDIR(x)
|
||||
|
||||
FFVersionResult ffVersionResult = {
|
||||
.projectName = FASTFETCH_PROJECT_NAME,
|
||||
.sysName = FF_SYSNAME,
|
||||
|
||||
Reference in New Issue
Block a user