drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added testing for _WIN64 when testing for _WIN32

Browse Source
This commit is contained in:
Landon Curt Noll
2021-12-08 12:04:13 -08:00
parent 9f3a7817d3
commit af72992ead
17 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
input.c
View File

@@ -31,7 +31,7 @@
#include <stdio.h>
#include <ctype.h>
#if !defined(_WIN32)
#if !defined(_WIN32) && !defined(_WIN64)
# include <pwd.h>
#else
# include <stdlib.h>
@@ -407,7 +407,7 @@ f_pathopen(char *name, char *mode, char *pathlist, char **openpath)
S_FUNC char *
homeexpand(char *name)
{
#if defined(_WIN32)
#if defined(_WIN32) || defined(_WIN64)
return NULL;
@@ -969,12 +969,12 @@ runrcfiles(void)
* a given device/inode, -1 otherwise.
*
*
* WIN32 NOTE:
* _WIN32 and _WIN64 NOTE:
*
* This function does not work under WIN32. The sbuf->st_ino is always
* This function does not work under _WIN32 or _WIN64. The sbuf->st_ino is always
* zero because the FAT and NTFS filesystems do not support inodes.
* They also don't support links, which is why you need this function
* under UNIX. For WIN32, use _fullpath() to determine if you have
* under UNIX. For _WIN32 or _WIN64, use _fullpath() to determine if you have
* already opened a file.
*
* given:
@@ -994,7 +994,7 @@ isinoderead(struct stat *sbuf)
/* scan the entire readset */
for (i=0; i < maxreadset; ++i) {
#if defined(_WIN32) || defined(__MSDOS__)
#if defined(_WIN32) || defined(_WIN64)
char tmp[MSDOS_MAX_PATH+1];
tmp[MSDOS_MAX_PATH] = '\0';
if (_fullpath(tmp, cip->i_name, MSDOS_MAX_PATH) &&
@@ -1120,10 +1120,10 @@ addreadset(char *name, char *path, struct stat *sbuf)
return -1;
}
strlcpy(readset[ret].name, name, name_len+1);
#if defined(_WIN32) || defined(__MSDOS__)
#if defined(_WIN32) || defined(_WIN64)
/*
* For WIN32, _fullpath expands the path to a fully qualified
* path name, which under WIN32 FAT and NTFS is unique, just
* For _WIN32 or _WIN64, _fullpath expands the path to a fully qualified
* path name, which under _WIN32 or _WIN64 FAT and NTFS is unique, just
* like UNIX inodes. _fullpath also allocated the memory for
* this new longer path name.
*/