darkkirb/old-Dispel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Made linux-dependent-code unix-dependent

Browse source 
!Checks for _LINUX_ being defined are not checks for _WIN32 being not defined
!Makefile does not touch /usr/bin anymore
This commit is contained in:
Morten Delenk 2015-06-23 15:27:24 +00:00
parent 35f15eb06c
commit 89c01b98f0
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -21,9 +21,9 @@ $(EXECUTABLE): $(OBJECTS)
.c.o: .c.o:
$(CC) -c $(CFLAGS) $< -o $@ $(CC) -c $(CFLAGS) $< -o $@
install: install:
cp -v $(EXECUTABLE) /usr/bin cp -v $(EXECUTABLE) /usr/local/bin
#FIXME It ALWAYS copies dispel to /usr/bin, regardless of OS #FIXME It ALWAYS copies dispel to /usr/bin, regardless of OS
uninstall: uninstall:
rm -rf /usr/bin/$(EXECUTABLE) rm -rf /usr/local/bin/$(EXECUTABLE)
clean: clean:
rm *.o ${EXECUTABLE} rm *.o ${EXECUTABLE}

5
main.c
View file

@ -11,7 +11,7 @@
#ifdef __APPLE__ #ifdef __APPLE__
#include <sys/uio.h> #include <sys/uio.h>
#else #else
#ifdef __linux__ #ifndef _WIN32
#include <sys/io.h> #include <sys/io.h>
#else #else
#include <io.h> #include <io.h>
@ -279,7 +279,7 @@ int main(int argc, char *argv[])
} }
// Read the file into memory // Read the file into memory
#if defined(__APPLE__) || defined(__linux__) #if !defined(_WIN32)
fseek(fin, 0L, SEEK_END); //Apple and linux code fseek(fin, 0L, SEEK_END); //Apple and linux code
len = ftell(fin); len = ftell(fin);
fseek(fin, 0L, SEEK_SET); fseek(fin, 0L, SEEK_SET);
@ -328,6 +328,7 @@ int main(int argc, char *argv[])
} }
} }
// Unmangle the address options // Unmangle the address options
pos = start; pos = start;