| defs.h | defs.h | |||
|---|---|---|---|---|
| skipping to change at line 174 | skipping to change at line 174 | |||
| /* | /* | |||
| * An alternative approach is also (p+0), but that does not ensure t hat | * An alternative approach is also (p+0), but that does not ensure t hat | |||
| * @p is a pointer. Since functions "support" infinite dereferencing , | * @p is a pointer. Since functions "support" infinite dereferencing , | |||
| * "&*" also works on them. | * "&*" also works on them. | |||
| */ | */ | |||
| # define DEMOTE_TO_PTR(p) (&*(p)) | # define DEMOTE_TO_PTR(p) (&*(p)) | |||
| #endif | #endif | |||
| #ifndef O_BINARY | #ifndef O_BINARY | |||
| # define O_BINARY 0 | # define O_BINARY 0 | |||
| #endif | #endif | |||
| #ifndef S_IRGRP | ||||
| /* Can happen in mingw */ | ||||
| # define S_IRGRP (S_IRUSR >> 3) | ||||
| #endif | ||||
| #ifndef S_IWGRP | ||||
| # define S_IWGRP (S_IWUSR >> 3) | ||||
| #endif | ||||
| #ifndef S_IXGRP | ||||
| # define S_IXGRP (S_IXUSR >> 3) | ||||
| #endif | ||||
| #ifndef S_IROTH | ||||
| # define S_IROTH (S_IRUSR >> 6) | ||||
| #endif | ||||
| #ifndef S_IWOTH | ||||
| # define S_IWOTH (S_IWUSR >> 6) | ||||
| #endif | ||||
| #ifndef S_IXOTH | ||||
| # define S_IXOTH (S_IXUSR >> 6) | ||||
| #endif | ||||
| #ifndef S_IRUGO | #ifndef S_IRUGO | |||
| # define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) | # define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) | |||
| #endif | #endif | |||
| #ifndef S_IWUGO | #ifndef S_IWUGO | |||
| # define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) | # define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) | |||
| #endif | #endif | |||
| #ifndef S_IXUGO | #ifndef S_IXUGO | |||
| # define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) | # define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) | |||
| #endif | #endif | |||
| #ifndef S_IRWXUGO | #ifndef S_IRWXUGO | |||
| skipping to change at line 196 | skipping to change at line 215 | |||
| #define HXSIZEOF_Z16 sizeof("-65536") | #define HXSIZEOF_Z16 sizeof("-65536") | |||
| /* 2^32 and -2^31 have differing length */ | /* 2^32 and -2^31 have differing length */ | |||
| #define HXSIZEOF_Z32 sizeof("-4294967296") | #define HXSIZEOF_Z32 sizeof("-4294967296") | |||
| /* 2^64 and -2^63 have same length */ | /* 2^64 and -2^63 have same length */ | |||
| #define HXSIZEOF_Z64 sizeof("18446744073709551616") | #define HXSIZEOF_Z64 sizeof("18446744073709551616") | |||
| #define __HX_STRINGIFY_EXPAND(s) #s | #define __HX_STRINGIFY_EXPAND(s) #s | |||
| #define HX_STRINGIFY(s) __HX_STRINGIFY_EXPAND(s) | #define HX_STRINGIFY(s) __HX_STRINGIFY_EXPAND(s) | |||
| #ifndef container_of | ||||
| # define container_of(v, s, m) containerof((v), s, m) | ||||
| #endif | ||||
| #endif /* _LIBHX_DEFS_H */ | #endif /* _LIBHX_DEFS_H */ | |||
| End of changes. 2 change blocks. | ||||
| 0 lines changed or deleted | 23 lines changed or added | |||
| wx_helper.hpp | wx_helper.hpp | |||
|---|---|---|---|---|
| skipping to change at line 14 | skipping to change at line 14 | |||
| /* Convert from UTF-8 to wxString; only valid within the scope of the resul t */ | /* Convert from UTF-8 to wxString; only valid within the scope of the resul t */ | |||
| #define wxfu8(s) wxString((s), wxConvUTF8) | #define wxfu8(s) wxString((s), wxConvUTF8) | |||
| /* Convert from UTF-8 to wxString for varargs/wxPrintf */ | /* Convert from UTF-8 to wxString for varargs/wxPrintf */ | |||
| #define wxfv8(s) (wxfu8(s).c_str()) | #define wxfv8(s) (wxfu8(s).c_str()) | |||
| /* Convert from wxString to UTF-8; limited validity */ | /* Convert from wxString to UTF-8; limited validity */ | |||
| #define wxtu8(s) static_cast<const char *>((s).ToUTF8()) | #define wxtu8(s) static_cast<const char *>((s).ToUTF8()) | |||
| /* Common frame flags */ | /* Common frame flags */ | |||
| #define wxCFF (wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU | wxCLOSE_BO | #define wxCFF (wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU | \ | |||
| X | \ | wxCLOSE_BOX | wxMAXIMIZE_BOX | wxMINIMIZE_BOX) | |||
| wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxFRAME_NO_TASKBAR) | /* Common dialog flags */ | |||
| #define wxCDF (wxCFF | wxFRAME_NO_TASKBAR) | ||||
| #define wxACV wxALIGN_CENTER_VERTICAL | #define wxACV wxALIGN_CENTER_VERTICAL | |||
| #define wxDPOS wxDefaultPosition | #define wxDPOS wxDefaultPosition | |||
| #define wxDSIZE wxDefaultSize | #define wxDSIZE wxDefaultSize | |||
| #define wxDSPAN wxDefaultSpan | ||||
| #endif /* _LIBHX_WXHELPER_HPP */ | #endif /* _LIBHX_WXHELPER_HPP */ | |||
| End of changes. 2 change blocks. | ||||
| 3 lines changed or deleted | 5 lines changed or added | |||