fix inline issue with newer compilers

quanta-computing · Apr 17, 2019 · 05c680f · 05c680f
1 parent c504f61
commit 05c680f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/extension/include/quanta_mon.h b/extension/include/quanta_mon.h
@@ -45,7 +45,7 @@
 
 /* Size of a temp scratch buffer            */
 #define SCRATCH_BUF_LEN            512
-#define QUANTA_MON_VERSION "1.3.0-beta"
+#define QUANTA_MON_VERSION "1.3.1"
 
 
 /* Xhprof's global state.

diff --git a/extension/include/utils.h b/extension/include/utils.h
@@ -11,7 +11,7 @@ void clear_frequencies();
 uint64_t cycle_timer();
 float cpu_cycles_range_to_ms(float cpufreq, long long start, long long end);
 float cpu_cycles_to_ms(float cpufreq, uint64_t count);
-inline double get_us_from_tsc(uint64_t count, double cpu_frequency);
+double get_us_from_tsc(uint64_t count, double cpu_frequency);
 long get_us_interval(struct timeval *start, struct timeval *end);
 
 //Compat
@@ -37,7 +37,7 @@ int safe_new(char *class, zval *ret, int params_count, zval params[] TSRMLS_DC);
 int safe_get_class_constant(char *class, char *name, zval *ret, int type TSRMLS_DC);
 
 
-inline uint8_t hp_inline_hash(const char *str);
+uint8_t hp_inline_hash(const char *str);
 const char *hp_get_base_filename(const char *filename);
 char *hp_get_function_name(zend_execute_data *data TSRMLS_DC);
 char *hp_get_function_name_fast(zend_execute_data *execute_data TSRMLS_DC);

diff --git a/extension/src/utils/hash.c b/extension/src/utils/hash.c
@@ -9,7 +9,7 @@
  *
  * @author cjiang
  */
-inline uint8_t hp_inline_hash(const char *str) {
+uint8_t hp_inline_hash(const char *str) {
   ulong h = 5381;
   uint i = 0;
   uint8_t res = 0;

diff --git a/extension/src/utils/timing.c b/extension/src/utils/timing.c
@@ -30,7 +30,7 @@ float cpu_cycles_range_to_ms(float cpufreq, long long start, long long end) {
   return cpu_cycles_to_ms(cpufreq, end - start);
 }
 
-inline double get_us_from_tsc(uint64_t count, double cpu_frequency) {
+double get_us_from_tsc(uint64_t count, double cpu_frequency) {
   return count / cpu_frequency;
 }