Skip to content

Fix boolean type mismatch on Windows when windows.h is included #240

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

Open
Senthil455 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −2
Open

Fix boolean type mismatch on Windows when windows.h is included #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions lib/base/include_jpeglib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,22 @@
// NOLINTBEGIN
/* clang-format off */
#include <stdio.h> // IWYU pragma: keep

#ifdef _WIN32
#undef RIGHT_SHIFT_IS_UNSIGNED
/* Define "boolean" as unsigned char, not int, per Windows custom */
#ifndef __RPCNDR_H__
typedef unsigned char boolean;
#endif
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
/* Define "INT32" as int, not long, per Windows custom */
#if !(defined(_BASETSD_H_) || defined(_BASETSD_H))
typedef short INT16;
typedef signed int INT32;
#endif
#define XMD_H /* prevent jmorecfg.h from redefining it */
#endif

#include <jpeglib.h> // IWYU pragma: export
#include <setjmp.h> // IWYU pragma: export
/* clang-format on */
Expand Down
2 changes: 1 addition & 1 deletion lib/jpegli/decode_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <cstdint>
#include <vector>

#include "jpeglib.h"
#include "lib/base/include_jpeglib.h"
#include "lib/base/compiler_specific.h"
#include "lib/jpegli/common_internal.h"
#include "lib/jpegli/huffman.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/jpegli/input.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <cstddef>
#include <cstdint>

#include "jpeglib.h"
#include "lib/base/include_jpeglib.h"
#include "lib/jpegli/common_internal.h"
#include "lib/jpegli/types.h"

Expand Down