Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 19:13:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #181 from Ansa89/master

Browse Source 
Use long int instead uint64_t
This commit is contained in:
JFreegman 2014-07-08 12:00:48 -04:00
commit e74212cb9e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/Makefile
View File

@ -93,7 +93,8 @@ endif
all: toxic all: toxic
toxic: $(OBJ) toxic: $(OBJ)
$(CC) $(CFLAGS) -o toxic $(OBJ) $(LDFLAGS) @echo " LD $@"
@$(CC) $(CFLAGS) -o toxic $(OBJ) $(LDFLAGS)
install: toxic install: toxic
mkdir -p $(abspath $(DESTDIR)/$(BINDIR)) mkdir -p $(abspath $(DESTDIR)/$(BINDIR))
@ -117,8 +118,9 @@ install: toxic
done done
%.o: $(SRC_DIR)/%.c %.o: $(SRC_DIR)/%.c
$(CC) $(CFLAGS) -o $*.o -c $(SRC_DIR)/$*.c @echo " CC $@"
$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c > $*.d @$(CC) $(CFLAGS) -o $*.o -c $(SRC_DIR)/$*.c
@$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c > $*.d
clean: clean:
rm -rf *.d *.o toxic rm -rf *.d *.o toxic

6
src/misc_tools.c
View File

@ -73,9 +73,9 @@ void get_elapsed_time_str(char *buf, int bufsize, uint64_t secs)
if (!secs) if (!secs)
return; return;
uint64_t seconds = secs % 60; long int seconds = secs % 60;
uint64_t minutes = (secs % 3600) / 60; long int minutes = (secs % 3600) / 60;
uint64_t hours = secs / 3600; long int hours = secs / 3600;
if (!minutes && !hours) if (!minutes && !hours)
snprintf(buf, bufsize, "%.2ld", seconds); snprintf(buf, bufsize, "%.2ld", seconds);