diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ini.c | 2 | ||||
| -rw-r--r-- | src/str.c | 8 | ||||
| -rw-r--r-- | src/system.c | 1 | ||||
| -rw-r--r-- | src/utils.c | 4 |
4 files changed, 9 insertions, 6 deletions
@@ -2,7 +2,7 @@ #include <stdlib.h> #include <string.h> #include <ctype.h> -#include "ohmycal.h" +#include "omc.h" #include "ini.h" struct INIFILE *ini_init() { @@ -488,13 +488,13 @@ void strsort(char **arr, unsigned int sort_mode) { // Default mode is alphabetic sort compar fn = _strsort_alpha_compare; - if (sort_mode == OHMYCAL_SORT_LEN_DESCENDING) { + if (sort_mode == OMC_SORT_LEN_DESCENDING) { fn = _strsort_dsc_compare; - } else if (sort_mode == OHMYCAL_SORT_LEN_ASCENDING) { + } else if (sort_mode == OMC_SORT_LEN_ASCENDING) { fn = _strsort_asc_compare; - } else if (sort_mode == OHMYCAL_SORT_ALPHA) { + } else if (sort_mode == OMC_SORT_ALPHA) { fn = _strsort_alpha_compare; // ^ still selectable though ^ - } else if (sort_mode == OHMYCAL_SORT_NUMERIC) { + } else if (sort_mode == OMC_SORT_NUMERIC) { fn = _strsort_numeric_compare; } diff --git a/src/system.c b/src/system.c index 8cd7303..94a96c0 100644 --- a/src/system.c +++ b/src/system.c @@ -3,6 +3,7 @@ // #include "system.h" +#include "omc.h" int shell(struct Process *proc, char *args[]) { FILE *fp_out, *fp_err; diff --git a/src/utils.c b/src/utils.c index 4e82a64..64166fe 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,5 +1,7 @@ #include <stdarg.h> -#include "ohmycal.h" +#include "omc.h" + +extern struct OMC_GLOBAL globals; char *dirstack[1024]; const size_t dirstack_max = sizeof(dirstack) / sizeof(dirstack[0]); |