From 112c00ecb85e2f1ae16841d01949f009a709fd5e Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 09 十二月 2016 10:38:37 +0800
Subject: [PATCH] merge my fix
---
ProxyServer/proxyserver.h | 47 +++++++++++++++++++----------------------------
1 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/ProxyServer/proxyserver.h b/ProxyServer/proxyserver.h
index 82fddec..c75e125 100644
--- a/ProxyServer/proxyserver.h
+++ b/ProxyServer/proxyserver.h
@@ -1,25 +1,26 @@
#include<sys/socket.h>
#include<sys/types.h>
#include<netinet/in.h>
-#include<netdb.h>
-#include<stdio.h>
-#include<string.h>
-#include<stdlib.h>
-#include<unistd.h>
-#include<errno.h>
-#include<arpa/inet.h>
-#include<time.h>
-#include<signal.h>
-#include<pthread.h>
-#include<sys/time.h>
-#include<stdbool.h>
-#include<fcntl.h>
-#include<sys/stat.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <time.h>
+#include <signal.h>
+#include <pthread.h>
+#include <sys/time.h>
+#include <stdbool.h>
+#include <fcntl.h>
+#include "/usr/include/mysql/mysql.h"
+#include <sys/stat.h>
#define _DELETE_FILE
-#include<dirent.h>
-#include<limits.h>
-#include<sys/io.h>
-#include<signal.h>
+#include <dirent.h>
+#include <limits.h>
+#include <sys/io.h>
+#include <signal.h>
int RealAlarmEventNum[16];
typedef struct{
int Year;
@@ -91,16 +92,6 @@
void UrnStringToBytes(char* byte_array_out,int * byte_array_length_out,char* StartTim,char* EndTime);
void zclock_sleep (int msecs);
-
-
-
-void zclock_sleep (int msecs)
-{
- struct timespec t;
- t.tv_sec = msecs / 1000;
- t.tv_nsec = (msecs % 1000) * 1000000;
- nanosleep (&t, NULL);
-}
typedef struct{
char name[1024];
--
Gitblit v1.8.0