diff options
| author | speidy <speidy@gmail.com> | 2014-03-02 01:39:34 +0200 |
|---|---|---|
| committer | speidy <speidy@gmail.com> | 2014-03-02 01:39:34 +0200 |
| commit | 1f1e803140ea96b81ac4700a6759a9617d0f2fd2 (patch) | |
| tree | e9d2761170ec2461f178a595482507700879deee /common/os_calls.h | |
| parent | 80204e2536327f46610d5925c552aff235e9f447 (diff) | |
| parent | 0b18909f269ee582ec22bb808839c4434a0da3e7 (diff) | |
| download | xrdp-proprietary-1f1e803140ea96b81ac4700a6759a9617d0f2fd2.tar.gz xrdp-proprietary-1f1e803140ea96b81ac4700a6759a9617d0f2fd2.zip | |
Merge ../../neutrinolabs/xrdp into fastpath
Conflicts:
libxrdp/libxrdp.c
libxrdp/libxrdp.h
libxrdp/xrdp_iso.c
libxrdp/xrdp_sec.c
libxrdp/xrdp_tcp.c
xrdp/xrdp.ini
Diffstat (limited to 'common/os_calls.h')
| -rw-r--r-- | common/os_calls.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/common/os_calls.h b/common/os_calls.h index b6e1c91a..06ce8494 100644 --- a/common/os_calls.h +++ b/common/os_calls.h @@ -161,5 +161,8 @@ int APP_CC g_time1(void); int APP_CC g_time2(void); int APP_CC g_time3(void); int APP_CC g_text2bool(const char *s); +void * APP_CC g_shmat(int shmid); +int APP_CC g_shmdt(const void *shmaddr); +int APP_CC g_gethostname(char *name, int len); #endif |