Skip to content

[giflib]fix compile error in x64-uwp #5578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rastaban merged 6 commits into from
Mar 28, 2019
Merged

[giflib]fix compile error in x64-uwp #5578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
760bee8
[giflib]fix compile error in x64-uwp
Mar 7, 2019
51feca0
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
Mar 8, 2019
d5db1b2
[giflib]Modify the location of the CMakelists.txt changes in the patc…
Mar 8, 2019
e733666
[giflib]Modify cmakelists.txt directly and delete the corresponding c…
Mar 11, 2019
ab63823
[giflib] Modernize. Avoid use of WINDOWS_EXPORT_ALL_SYMBOLS.
ras0219-msft Mar 27, 2019
82e38f3
Merge branch 'master' into dev/jack/3043
Rastaban Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/giflib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ set(GIFLIB_SOURCES
lib/quantize.c
)

add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_library(gif ${GIFLIB_SOURCES})

if (NOT GIFLIB_SKIP_HEADERS)
Expand Down
76 changes: 76 additions & 0 deletions ports/giflib/fix-compile-error.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c
index fddc0d2..7a6ab9c 100644
--- a/lib/dgif_lib.c
+++ b/lib/dgif_lib.c
@@ -54,7 +54,7 @@ DGifOpenFileName(const char *FileName, int *Error)
int FileHandle;
GifFileType *GifFile;

- if ((FileHandle = open(FileName, O_RDONLY)) == -1) {
+ if ((FileHandle = _open(FileName, O_RDONLY)) == -1) {
if (Error != NULL)
*Error = D_GIF_ERR_OPEN_FAILED;
return NULL;
@@ -81,7 +81,7 @@ DGifOpenFileHandle(int FileHandle, int *Error)
if (GifFile == NULL) {
if (Error != NULL)
*Error = D_GIF_ERR_NOT_ENOUGH_MEM;
- (void)close(FileHandle);
+ (void)_close(FileHandle);
return NULL;
}

@@ -95,7 +95,7 @@ DGifOpenFileHandle(int FileHandle, int *Error)
if (Private == NULL) {
if (Error != NULL)
*Error = D_GIF_ERR_NOT_ENOUGH_MEM;
- (void)close(FileHandle);
+ (void)_close(FileHandle);
free((char *)GifFile);
return NULL;
}
@@ -106,7 +106,7 @@ DGifOpenFileHandle(int FileHandle, int *Error)
_setmode(FileHandle, O_BINARY); /* Make sure it is in binary mode. */
#endif /* _WIN32 */

- f = fdopen(FileHandle, "rb"); /* Make it into a stream: */
+ f = _fdopen(FileHandle, "rb"); /* Make it into a stream: */

/*@-mustfreeonly@*/
GifFile->Private = (void *)Private;
diff --git a/lib/egif_lib.c b/lib/egif_lib.c
index f30b61b..18dc4a2 100644
--- a/lib/egif_lib.c
+++ b/lib/egif_lib.c
@@ -60,10 +60,10 @@ EGifOpenFileName(const char *FileName, const bool TestExistence, int *Error)
GifFileType *GifFile;

if (TestExistence)
- FileHandle = open(FileName, O_WRONLY | O_CREAT | O_EXCL,
+ FileHandle = _open(FileName, O_WRONLY | O_CREAT | O_EXCL,
S_IREAD | S_IWRITE);
else
- FileHandle = open(FileName, O_WRONLY | O_CREAT | O_TRUNC,
+ FileHandle = _open(FileName, O_WRONLY | O_CREAT | O_TRUNC,
S_IREAD | S_IWRITE);

if (FileHandle == -1) {
@@ -73,7 +73,7 @@ EGifOpenFileName(const char *FileName, const bool TestExistence, int *Error)
}
GifFile = EGifOpenFileHandle(FileHandle, Error);
if (GifFile == (GifFileType *) NULL)
- (void)close(FileHandle);
+ (void)_close(FileHandle);
return GifFile;
}

@@ -118,7 +118,7 @@ EGifOpenFileHandle(const int FileHandle, int *Error)
_setmode(FileHandle, O_BINARY); /* Make sure it is in binary mode. */
#endif /* _WIN32 */

- f = fdopen(FileHandle, "wb"); /* Make it into a stream: */
+ f = _fdopen(FileHandle, "wb"); /* Make it into a stream: */

GifFile->Private = (void *)Private;
Private->FileHandle = FileHandle;

4 changes: 3 additions & 1 deletion ports/giflib/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${GIFLIB_VERSION}
PATCHES msvc-guard-unistd-h.patch
PATCHES
msvc-guard-unistd-h.patch
fix-compile-error.patch
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
Expand Down