Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / conversation / gnunet_gst_def.h

diff --git a/src/conversation/gnunet_gst_def.h b/src/conversation/gnunet_gst_def.h
index 2e6903db4dead4b18de0b15a791a3a109c544ccd..85add54b68aa754568b62d65979f0113217a35f4 100644 (file)
--- a/src/conversation/gnunet_gst_def.h
+++ b/src/conversation/gnunet_gst_def.h
@@ -1,21 +1,46 @@
+/*
+  This file is part of GNUnet.
+  Copyright (C) 2016 GNUnet e.V.
+
+  GNUnet 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, or (at your
+  option) any later version.
+
+  GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+*/
+/**
+ * @file conversation/gnunet_gst_def.h
+ * @brief FIXME
+ * @author Hark
+ */
+
 #include <getopt.h>
-#include <string.h> 
+#include <string.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
-#include <regex.h> 
+#include <regex.h>
 
 
-#include "gnunet/platform.h"
-#include "gnunet/gnunet_util_lib.h"
-#include "gnunet/gnunet_protocols.h"
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_protocols.h"
 //#include "gnunet/conversation.h" doesn't get installed
 #include "conversation.h"
-#include "gnunet/gnunet_constants.h"
-#include "gnunet/gnunet_core_service.h"
-#include "gnunet/gnunet_common.h"
+#include "gnunet_constants.h"
+#include "gnunet_core_service.h"
+#include "gnunet_common.h"
 
 /*
 #include <gst/gst.h>
@@ -40,20 +65,23 @@
 #include <gst/app/gstappsink.h>
 
 // sockets
+#ifndef MINGW
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #include <sys/socket.h>
-#include <fcntl.h>
 #include <arpa/inet.h>
+#include <netdb.h>
+#endif
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
+#include <fcntl.h>
 
 
 //glib stuff
 //#include <glib.h>
 #include <glib-2.0/glib/gprintf.h>
-#include <glib-unix.h>
+//#include <glib-unix.h>
 
 // static struct AudioMessage *audio_message;
 
@@ -70,7 +98,7 @@ struct GNUNET_gstData {
   GstElement *appsrc;
   GstElement *appsink;
   //settings
-  int audiobackend;  
+  int audiobackend;
   int dropsilence;
   int usertp;
   int pure_ogg;