Skip to content

FIX 2 errors on PPC_DARWIN #1172

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
VictorMiasnikov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FIX 2 errors on PPC_DARWIN #1172

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
9 changes: 9 additions & 0 deletions m3-libs/m3core/src/m3core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,12 @@
#include "winsock2.h"
#include "ws2tcpip.h"
#endif
#ifndef M3_BOOL_H_INCLUDED
#define M3_BOOL_H_INCLUDED
typedef int BOOL;
#define TRUE 1
#define FALSE 0
#endif

/* __DARWIN_UNIX03 defaults to 1 on older and newer headers,
* but older headers still have context "ss" instead of "__ss"
Expand Down Expand Up @@ -695,7 +698,10 @@ typedef int/*not socklen_t*/ m3c_socklen_t;
#endif

#define Usocket__socklen_t Usocket__socklen_t /* inhibit m3c type */
#ifndef M3_USOCKET__SOCKLEN_T_H_INCLUDED
#define M3_USOCKET__SOCKLEN_T_H_INCLUDED
typedef m3_socklen_t Usocket__socklen_t;
#endif

typedef struct {
/* verified to exactly match struct linger in UnixC.c, except for Cygwin */
Expand All @@ -718,7 +724,10 @@ typedef struct {
#define Usocket__socklen_t Usocket__socklen_t /* inhibit m3c type */
typedef M3SockAddrUnionAll* Usocket__struct_sockaddr_in_star;
typedef const M3SockAddrUnionAll* Usocket__const_struct_sockaddr_in_star;
#ifndef M3_USOCKET__SOCKLEN_T_H_INCLUDED
#define M3_USOCKET__SOCKLEN_T_H_INCLUDED
typedef m3_socklen_t Usocket__socklen_t;
#endif
typedef m3_socklen_t* Usocket__socklen_t_star;

int __cdecl Usocket__listen(int s, int backlog);
Expand Down
3 changes: 3 additions & 0 deletions m3-sys/m3back/src/M3CC.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@
extern "C" {
#endif

#ifndef M3_BOOL_H_INCLUDED
#define M3_BOOL_H_INCLUDED
typedef int BOOL;
#define FALSE 0
#define TRUE 1
#endif

TEXT
__cdecl
Expand Down