From 0ddcfc423e687b6c0bf3819f9c0ab1b6682adb7f Mon Sep 17 00:00:00 2001 From: mpc <mpc> Date: Thu, 9 Dec 2004 14:05:22 +0000 Subject: [PATCH] *** empty log message *** --- apps/sam/c/Makefile.mingw | 6 +++--- apps/sam/c/examples/warhammer/Makefile.mingw | 4 ++-- apps/sam/c/inc/sam.h | 1 + apps/sam/c/src/sam.c | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/sam/c/Makefile.mingw b/apps/sam/c/Makefile.mingw index f9c5882cfb..d418f175a6 100644 --- a/apps/sam/c/Makefile.mingw +++ b/apps/sam/c/Makefile.mingw @@ -21,9 +21,9 @@ SRCDIR = src # Programs # -AR = C:\Dev-Cpp\bin\ar -CC = C:\Dev-Cpp\bin\gcc -RM = C:\Dev-Cpp\bin\rm +AR = C:\MinGW\bin\ar +CC = C:\MinGW\bin\gcc +RM = C:\MinGW\bin\rm # # Flags diff --git a/apps/sam/c/examples/warhammer/Makefile.mingw b/apps/sam/c/examples/warhammer/Makefile.mingw index 414a0d9df3..d5d85b831e 100644 --- a/apps/sam/c/examples/warhammer/Makefile.mingw +++ b/apps/sam/c/examples/warhammer/Makefile.mingw @@ -6,8 +6,8 @@ # Programs # -CC = C:\Dev-Cpp\bin\gcc -RM = C:\Dev-Cpp\bin\rm +CC = C:\MinGW\bin\gcc +RM = C:\MinGW\bin\rm # # Flags diff --git a/apps/sam/c/inc/sam.h b/apps/sam/c/inc/sam.h index 0c58b9fa70..32cce31566 100644 --- a/apps/sam/c/inc/sam.h +++ b/apps/sam/c/inc/sam.h @@ -87,6 +87,7 @@ typedef struct { int sock; /* the socket used for communications with SAM */ bool connected; /* whether the socket is connected */ sam_sid_t prev_id; /* the last stream id number we used */ + void *child; /* whatever you want it to be */ } sam_sess_t; /* a SAM session */ typedef enum { /* see sam_strerror() for detailed descriptions of these */ diff --git a/apps/sam/c/src/sam.c b/apps/sam/c/src/sam.c index 7a80c26198..9fe35486ed 100644 --- a/apps/sam/c/src/sam.c +++ b/apps/sam/c/src/sam.c @@ -937,6 +937,7 @@ sam_sess_t *sam_session_init(sam_sess_t *session) SAMLOGS("Out of memory"); abort(); } + session->child = NULL; } session->connected = false; session->prev_id = 0; -- GitLab