From ccce80a1e91b99c58d1a4e1453b5238036e84f22 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Wed, 2 Jun 2021 21:53:29 +0530 Subject: [PATCH] Remove _Atomic usage --- patches/README.md | 15 ++++++++------- src/nnn.c | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/patches/README.md b/patches/README.md index 44f87099..316e4c80 100644 --- a/patches/README.md +++ b/patches/README.md @@ -1,14 +1,15 @@

User Patch Framework

-This directory contains user submitted patches that were rejected from mainline as they tend to be more subjective in nature. The patches will be adapted on each release when necessary (v4.1 onwards). Each patch can be applied through its respective make variable during compilation. In case inter-patch merge conflicts occur, a compatability patch is provided and will automatically be applied. +This directory contains sizable user submitted patches that were rejected from mainline as they tend to be more subjective in nature. + +The patches will be adapted on each release when necessary (v4.1 onwards). Each patch can be applied through its respective make variable during compilation. In case inter-patch merge conflicts occur, a compatability patch is provided and will automatically be applied. ## List of patches -| Patch (a-z) | Description | Make variable | -| --- | --- | --- | -| gitstatus | Add git status column to the detail view. Requires [libgit2](https://github.com/libgit2/libgit2). | O_GISTATUS | -| namefirst | Print filenames first in the detail view. Print user/group columns when a directory contains different users/groups. | O_NAMEFIRST | +| Patch (a-z) | Description | Make var | +| --- | --- | --- | --- | +| gitstatus | Add git status column to the detail view. Requires [libgit2](https://github.com/libgit2/libgit2). | `O_GISTATUS` | +| namefirst | Print filenames first in the detail view. Print user/group columns when a directory contains different users/groups. | `O_NAMEFIRST` | -To apply the patches, use the corresponding make variables, e.g.: +To apply a patch, use the corresponding make variable, e.g.: make O_NAMEFIRST=1 - diff --git a/src/nnn.c b/src/nnn.c index d83d7f6b..ebd2985a 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -452,7 +452,7 @@ static pthread_mutex_t running_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t hardlink_mutex = PTHREAD_MUTEX_INITIALIZER; static ulong_t *core_files; static blkcnt_t *core_blocks; -static _Atomic volatile ulong_t num_files; +static ulong_t num_files; typedef struct { char path[PATH_MAX];