4 files changed, 10 insertions, 9 deletions
diff --git a/sesman/libscp/Makefile.am b/sesman/libscp/Makefile.am
index eaf518a8..3172f2cb 100644
--- a/sesman/libscp/Makefile.am
+++ b/sesman/libscp/Makefile.am
@@ -1,13 +1,11 @@
 EXTRA_DIST = libscp_connection.h libscp_commands.h libscp.h libscp_session.h libscp_types_mng.h libscp_v1c_mng.h libscp_vX.h libscp_commands_mng.h libscp_init.h libscp_tcp.h libscp_v0.h libscp_v1s.h libscp_lock.h \
 libscp_types.h libscp_v1c.h libscp_v1s_mng.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\"
-
-INCLUDES = \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\" \
   -I$(top_srcdir)/common
 
 lib_LTLIBRARIES = \
diff --git a/sesman/libscp/libscp_lock.c b/sesman/libscp/libscp_lock.c
index 4db05422..d35e3c9c 100644
--- a/sesman/libscp/libscp_lock.c
+++ b/sesman/libscp/libscp_lock.c
@@ -57,7 +57,7 @@ scp_lock_fork_request(void)
 
     if (lock_fork_blockers_count == 0)
     {
-        /* if noone is blocking fork(), then we're allowed to fork */
+        /* if no one is blocking fork(), then we're allowed to fork */
         sem_post(&lock_fork_req);
     }
 
diff --git a/sesman/libscp/libscp_lock.h b/sesman/libscp/libscp_lock.h
index b4e93c52..ae2c361b 100644
--- a/sesman/libscp/libscp_lock.h
+++ b/sesman/libscp/libscp_lock.h
@@ -52,8 +52,8 @@ scp_lock_fork_release(void);
  *
  * @brief starts a section that is critical for forking
  *
- * starts a section that is critical for forking, that is noone can fork()
- * while i'm in a critical section. But if someone wanted to fork we have
+ * starts a section that is critical for forking, that is no one can fork()
+ * while I'm in a critical section. But if someone wanted to fork we have
  * to wait until he finishes with lock_fork_release()
  *
  * @return
diff --git a/sesman/libscp/libscp_v1s.c b/sesman/libscp/libscp_v1s.c
index 69997ab2..fb137433 100644
--- a/sesman/libscp/libscp_v1s.c
+++ b/sesman/libscp/libscp_v1s.c
@@ -435,8 +435,11 @@ scp_v1s_list_sessions(struct SCP_CONNECTION *c, int sescnt, struct SCP_DISCONNEC
     }
 
     /* then we wait for client ack */
-#warning maybe this message could say if the session should be resized on
-#warning server side or client side
+
+    /*
+     * Maybe this message could say if the session should be resized on
+     * server side or client side.
+     */
     init_stream(c->in_s, c->in_s->size);
 
     if (0 != scp_tcp_force_recv(c->in_sck, c->in_s->data, 8))