Removed

diff --git a/lib/silccore/silcchannel.c b/lib/silccore/silcchannel.c
index f9e6ff85d4d061dacf707b017a6593613629f86b..2c1b7155f69ac76a743d6651d3459434d1a3829a 100644 (file)
--- a/lib/silccore/silcchannel.c
+++ b/lib/silccore/silcchannel.c
@@ -23,7 +23,22 @@
 
 #include "silcincludes.h"
 #include "silcchannel.h"
-#include "silcchannel_i.h"
+
+/******************************************************************************
+
+                              Channel Payload
+
+******************************************************************************/
+
+/* Channel Message Payload structure. Contents of this structure is parsed
+   from SILC packets. */
+struct SilcChannelPayloadStruct {
+  unsigned char *channel_name;
+  unsigned char *channel_id;
+  SilcUInt32 mode;
+  SilcUInt16 name_len;
+  SilcUInt16 id_len;
+};
 
 /* Parses channel payload returning new channel payload structure. */
 
@@ -217,6 +232,17 @@ SilcUInt32 silc_channel_get_mode(SilcChannelPayload payload)
 
 ******************************************************************************/
 
+/* Channel Key Payload structrue. Channel keys are parsed from SILC
+   packets into this structure. */
+struct SilcChannelKeyPayloadStruct {
+  unsigned char *id;
+  unsigned char *cipher;
+  unsigned char *key;
+  SilcUInt16 id_len;
+  SilcUInt16 cipher_len;
+  SilcUInt16 key_len;
+};
+
 /* Parses channel key payload returning new channel key payload structure */
 
 SilcChannelKeyPayload 

diff --git a/lib/silccore/silcchannel_i.h b/lib/silccore/silcchannel_i.h
deleted file mode 100644 (file)
index 34dc5bb..0000000
--- a/lib/silccore/silcchannel_i.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-
-  silcchannel_i.h 
-
-  Author: Pekka Riikonen <priikone@silcnet.org>
-
-  Copyright (C) 1997 - 2002 Pekka Riikonen
-
-  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; version 2 of the License.
-
-  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.
-
-*/
-
-#ifndef SILCCHANNEL_I_H
-#define SILCCHANNEL_I_H
-
-#ifndef SILCCHANNEL_H
-#error "Do not include internal header file directly"
-#endif
-
-/******************************************************************************
-
-                              Channel Payload
-
-******************************************************************************/
-
-/* Channel Message Payload structure. Contents of this structure is parsed
-   from SILC packets. */
-struct SilcChannelPayloadStruct {
-  unsigned char *channel_name;
-  unsigned char *channel_id;
-  SilcUInt32 mode;
-  SilcUInt16 name_len;
-  SilcUInt16 id_len;
-};
-
-
-/******************************************************************************
-
-                             Channel Key Payload
-
-******************************************************************************/
-
-/* Channel Key Payload structrue. Channel keys are parsed from SILC
-   packets into this structure. */
-struct SilcChannelKeyPayloadStruct {
-  unsigned char *id;
-  unsigned char *cipher;
-  unsigned char *key;
-  SilcUInt16 id_len;
-  SilcUInt16 cipher_len;
-  SilcUInt16 key_len;
-};
-
-#endif /* SILCCHANNEL_I_H */