finalise 1.2.1

[chiark-tcl.git] / dgram / dgram.h

diff --git a/dgram/dgram.h b/dgram/dgram.h
index 99a6d103b541fa45a567bef1408dcc9f3bcebe4e..6c31f18b3ab45aa08ccbcf962f0f41b5a2da89d0 100644 (file)
--- a/dgram/dgram.h
+++ b/dgram/dgram.h
@@ -1,5 +1,5 @@
 /* dgram - Tcl extension for udp datagrams
- * Copyright 2006 Ian Jackson
+ * Copyright 2006-2012 Ian Jackson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -12,11 +12,13 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef DGRAM_H
+#define DGRAM_H
+
+#include "hbytes.h"
 
 /* from sockaddr.c */
 
@@ -26,17 +28,20 @@ typedef struct {
 
 extern Tcl_ObjType sockaddr_type;
 
-void sockaddr_clear(SockAddr_Value*);
-void sockaddr_create(SockAddr_Value*, const struct sockaddr *addr, int len);
-int sockaddr_len(const SockAddr_Value*);
-const struct sockaddr *sockaddr_addr(const SockAddr_Value*);
-void sockaddr_free(const SockAddr_Value*);
+void cht_sockaddr_clear(SockAddr_Value*);
+void cht_sockaddr_create(SockAddr_Value*, const struct sockaddr *addr, int al);
+int cht_sockaddr_len(const SockAddr_Value*);
+const struct sockaddr *cht_sockaddr_addr(const SockAddr_Value*);
+void cht_sockaddr_free(const SockAddr_Value*);
 
 /* from dgram.c */
 
-extern const IdDataSpec dgram_socks;
+extern const IdDataSpec cht_dgram_socks;
 
 /* from misc.c */
 
-int setnonblock(int fd, int isnonblock);
+int cht_setnonblock(int fd, int isnonblock);
+
+#include "dgram+tcmdif.h"
 
+#endif /*DGRAM_H*/