Skip to content
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.

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

Improve dialog window association and _InputBox$ support on Windows #245

Merged
merged 4 commits into from
Nov 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/c/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
//#include <math.h> //<-causes overloading abs conflicts in Windows
# include <cmath>
# endif
# include <stdint.h>
# include <errno.h>
# include <fcntl.h>
# include <fstream>
Expand All @@ -82,7 +83,6 @@
# else

# include <pthread.h>
# include <stdint.h>
# include <stdlib.h>
# include <sys/stat.h>
# include <sys/types.h>
Expand Down
27 changes: 8 additions & 19 deletions internal/c/os.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,14 @@
* Should this be adapted to check for each type before defining?
*/
#ifndef QB64_OS_H_NO_TYPES
# ifdef QB64_WINDOWS
# define uint64 unsigned __int64
# define uint32 unsigned __int32
# define uint16 unsigned __int16
# define uint8 unsigned __int8
# define int64 __int64
# define int32 __int32
# define int16 __int16
# define int8 __int8
# else
# define int64 int64_t
# define int32 int32_t
# define int16 int16_t
# define int8 int8_t
# define uint64 uint64_t
# define uint32 uint32_t
# define uint16 uint16_t
# define uint8 uint8_t
# endif
# define int64 int64_t
# define int32 int32_t
# define int16 int16_t
# define int8 int8_t
# define uint64 uint64_t
# define uint32 uint32_t
# define uint16 uint16_t
# define uint8 uint8_t

# define ptrszint intptr_t
# define uptrszint uintptr_t
Expand Down