summaryrefslogtreecommitdiffstats
path: root/sesman/chansrv/chansrv.h
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2012-09-08 22:12:22 -0700
committerJay Sorg <jay.sorg@gmail.com>2012-09-08 22:12:22 -0700
commit3399b953ebd331c7d250e2be1e9a92fe4b48f7c3 (patch)
treea0b61b8aa7939775646f2ec459ab5775ccb2aeba /sesman/chansrv/chansrv.h
parent38465ae214895dfff10ca25b3e8e7c9f9ee5b1ff (diff)
parent3cedfae76a2351bc8b1e5bd2ee33bbf8630dbacf (diff)
downloadxrdp-proprietary-3399b953ebd331c7d250e2be1e9a92fe4b48f7c3.tar.gz
xrdp-proprietary-3399b953ebd331c7d250e2be1e9a92fe4b48f7c3.zip
Merge branch 'master' of github.com:FreeRDP/xrdp
Diffstat (limited to 'sesman/chansrv/chansrv.h')
-rw-r--r--sesman/chansrv/chansrv.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/sesman/chansrv/chansrv.h b/sesman/chansrv/chansrv.h
index a7a0f3e7..ba593461 100644
--- a/sesman/chansrv/chansrv.h
+++ b/sesman/chansrv/chansrv.h
@@ -21,14 +21,21 @@
#include "arch.h"
#include "parse.h"
+#include "log.h"
-#define XRDP_CHANNEL_LOG 0
+struct chan_out_data
+{
+ struct stream* s;
+ struct chan_out_data* next;
+};
struct chan_item
{
int id;
int flags;
char name[16];
+ struct chan_out_data* head;
+ struct chan_out_data* tail;
};
int APP_CC
@@ -47,12 +54,7 @@ main_cleanup(void);
} \
}
-#if XRDP_CHANNEL_LOG
-#include "log.h"
#define LOGM(_args) do { log_message _args ; } while (0)
-#else
-#define LOGM(_args)
-#endif
#ifndef GSET_UINT8
#define GSET_UINT8(_ptr, _offset, _data) \