Skip to content

Commit

Permalink
Fix segfault due to linker issue (Fixes #1)
Browse files Browse the repository at this point in the history
  • Loading branch information
rasa committed Mar 28, 2015
1 parent cabf759 commit faec5c0
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -458,3 +458,8 @@ sha1s.txt
sha256s.txt
*.asc
*.sha256

.*.uploaded
.*.scanned
.*.released
.*.tagged
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.9 (28-Mar-2015)

* Fix segfault due to linker issue (#1)

## 1.8 (27-Mar-2015)

* Executables signed with StartSSL code signing certificate
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ endif
define FIND_SIGNTOOL

ifndef SIGNTOOL
SDK_DIR:=$$(shell cygpath -m -s $(1) 2>/dev/null)
SDK_DIR:=$$(shell cygpath -m -s "$(1)" 2>/dev/null)
ifneq ($$(wildcard $$(SDK_DIR)/signtool.exe),)
SIGNTOOL:=$$(SDK_DIR)/signtool.exe
endif
Expand Down Expand Up @@ -371,7 +371,7 @@ publish: $(UPLOADED_FILES) $(SCANNED_FILES)

.PHONY: tidy
tidy: clean
-rm -f $(CLEANED_FILES) \
-rm -f $(CLEAN_FILES) \
$(HASH_FILES) \
$(SIGNED_FILES) \
$(UPXED_FILES)
Expand Down
5 changes: 1 addition & 4 deletions res_set.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@ to do:
#include <limits.h>
#include <stdlib.h>

#include "Stackwalker.h"
#include "Optimize.h"
#include "SystemMessage.h"
#include "debug.h"
#include "getopt.h"
#include "SystemMessage.h"

#include "version.h"

Expand Down
4 changes: 2 additions & 2 deletions version.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define VER_INTERNAL_NAME "res_set"
#define VER_FILE_DESCRIPTION "Display or change the monitor resolution, color depth, or refresh rate"
#define VER_MAJOR 1
#define VER_MINOR 8
#define VER_STRING2 "1.8"
#define VER_MINOR 9
#define VER_STRING2 "1.9"

#include "ver_defaults.h"

0 comments on commit faec5c0

Please sign in to comment.