com php-src: Address some compiler warnings.: sapi/litespeed/ls api_main.c sapi/litespeed/lscriu.c
| From: | George Wang | Date: | Thu, 23 Jul 2020 21:21:24 +0000 |
| Subject: | com php-src: Address some compiler warnings.: sapi/litespeed/ls api_main.c sapi/litespeed/lscriu.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-112352@lists.php.net to get a copy of this message | ||
Commit: 293d2f99f1c418103af6b239ad0693b89d454aed
Author: George Wang <gwang@php.net> Thu, 23 Jul 2020 17:21:24 -0400
Parents: 78fc12a37a1a96815c68ecaec053ca44d047fc4b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=293d2f99f1c418103af6b239ad0693b89d454aed
Log:
Address some compiler warnings.
Changed paths:
M sapi/litespeed/lsapi_main.c
M sapi/litespeed/lscriu.c
Diff:
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
index f7158e9ee9..03419d5e97 100644
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@ -23,6 +23,7 @@
#include "zend.h"
#include "ext/standard/basic_functions.h"
#include "ext/standard/info.h"
+#include "ext/standard/head.h"
#include "lsapilib.h"
#include "lsapi_main_arginfo.h"
diff --git a/sapi/litespeed/lscriu.c b/sapi/litespeed/lscriu.c
index f9659b332a..ba6e5b44cd 100644
--- a/sapi/litespeed/lscriu.c
+++ b/sapi/litespeed/lscriu.c
@@ -403,8 +403,8 @@ static void LSCRIU_Restored_Error(int iFatal, char *format, ...) {
}
}
#else // no debugging
-static void inline LSCRIU_Debugging(void) {}
-static void inline LSCRIU_Restored_Error(int iFatal, char *format, ...) {}
+static inline void LSCRIU_Debugging(void) {}
+static inline void LSCRIU_Restored_Error(int iFatal, char *format, ...) {}
#endif
@@ -626,12 +626,14 @@ static int LSCRIU_Init_Env_Parameters(void)
gc_type == CRIU_GCOUNTER_SIG ? "signals" : "pipe");
lsapi_criu_signal(SIGUSR2, lsapi_siguser2);
}
- else
+ else {
lscriu_dbg("LSCRIU (%d): Use shared memory\n", getpid());
- LSCRIU_Set_Global_Counter_Type(gc_type);
+ }
+ LSCRIU_Set_Global_Counter_Type(gc_type);
}
- else
+ else {
lscriu_dbg("LSCRIU (%d): NOT Listening\n", getpid());
+ }
char *criu_mode = NULL;
criu_mode = getenv("LSAPI_CRIU");