From e7e07f42b336bb7b5c488eb3bcc6397c0a2a03f4 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 24 八月 2020 16:36:09 +0800
Subject: [PATCH] fix conflict
---
common/include/usg_common.h | 78 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/common/include/usg_common.h b/common/include/usg_common.h
new file mode 100644
index 0000000..ec6c404
--- /dev/null
+++ b/common/include/usg_common.h
@@ -0,0 +1,78 @@
+/*
+ * Our own header, to be included before all standard system headers.
+ */
+
+#ifndef __USG_COMMON_H__
+#define __USG_COMMON_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <dirent.h>
+#include <time.h>
+#include <sched.h>
+
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/sem.h>
+#include <sys/shm.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <errno.h>
+#include <math.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+/*
+define int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t
+*/
+#include <stdint.h>
+
+
+
+//c++ header
+
+#include <iostream>
+#include <string>
+#include <cstdlib>
+#include <atomic>
+#include <algorithm>
+#include <iomanip>
+#include <limits>
+#include <map>
+#include <initializer_list>
+#include <vector>
+#include <thread>
+
+
+
+
+/* Our own error-handling functions */
+
+void err_exit(int error, const char *fmt, ...);
+void err_msg(int error, const char *fmt, ...);
+
+static inline int
+itoa(int num, char *str)
+{
+ return sprintf(str, "%d", num);
+
+}
+
+static inline int
+ftoa(float num, char *str)
+{
+ return sprintf(str, "%f", num);
+
+}
+#endif
--
Gitblit v1.8.0