summaryrefslogtreecommitdiffstats
path: root/desktop/cairo-dock-plugins/patches/time_h-confict.patch
blob: 0a2ea720d1f5288d6693c9ec1d642d361e5bee20 (plain)
--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c.glibc	2016-12-11 16:10:41.656840262 +0900
+++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c	2016-12-11 16:23:31.875117800 +0900
@@ -17,6 +17,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "applet-time_h-struct.h"
 #include <string.h>
 
 #include "applet-struct.h"
--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c.glibc	2016-12-11 16:10:41.657840257 +0900
+++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c	2016-12-11 16:22:24.465443591 +0900
@@ -17,6 +17,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "applet-time_h-struct.h"
 #include "stdlib.h"
 
 #include "applet-struct.h"
--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c.glibc	2015-02-20 01:13:47.000000000 +0900
+++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c	2016-12-11 16:24:08.991938415 +0900
@@ -17,6 +17,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "applet-time_h-struct.h"
 #include <stdlib.h>
 #include <string.h>
 
@@ -66,4 +67,4 @@
 	
 	
 	return GLDI_NOTIFICATION_LET_PASS;
-}
\ ファイル末尾に改行がありません
+}
--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c.glibc	2015-02-20 01:13:47.000000000 +0900
+++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c	2016-12-11 16:23:55.137005376 +0900
@@ -19,6 +19,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "applet-time_h-struct.h"
 #include <stdlib.h>
 #ifndef __FreeBSD__
 #include <endian.h>
--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h.glibc	2016-12-11 16:10:41.657840257 +0900
+++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h	2016-12-11 16:22:59.589273837 +0900
@@ -21,6 +21,7 @@
 #ifndef __CD_APPLET_STRUCT__
 #define  __CD_APPLET_STRUCT__
 
+#include "applet-time_h-struct.h"
 #include <sys/types.h>
 #include <alsa/asoundlib.h>
 #define _STRUCT_TIMEVAL
--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h.glibc	2016-12-11 16:11:55.464483550 +0900
+++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h	2016-12-11 16:19:52.003180440 +0900
@@ -0,0 +1,27 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __CD_APPLET_TIME_H_STRUCT__
+#define  __CD_APPLET_TIME_H_STRUCT__
+
+#define _POSIX_C_SOURCE 200809L
+#include <time.h>
+
+#endif
+
--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c.glibc	2015-02-20 01:13:47.000000000 +0900
+++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c	2016-12-11 16:20:44.168928323 +0900
@@ -20,6 +20,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "applet-time_h-struct.h"
 #include <stdlib.h>
 
 #include "applet-struct.h"
--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h.glibc	2015-02-20 01:13:47.000000000 +0900
+++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h	2016-12-11 16:19:47.713201174 +0900
@@ -20,6 +20,7 @@
 #ifndef __CD_APPLET_STRUCT__
 #define  __CD_APPLET_STRUCT__
 
+#include "applet-time_h-struct.h"
 #include <sys/types.h>
 #include <alsa/asoundlib.h>
 #define _STRUCT_TIMEVAL
--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h.glibc	2016-12-11 16:11:55.464483550 +0900
+++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h	2016-12-11 16:19:52.003180440 +0900
@@ -0,0 +1,27 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __CD_APPLET_TIME_H_STRUCT__
+#define  __CD_APPLET_TIME_H_STRUCT__
+
+#define _POSIX_C_SOURCE 200809L
+#include <time.h>
+
+#endif
+