Author: ArcRiley
Date: 2009-01-11 18:46:06 -0500 (Sun, 11 Jan 2009)
New Revision: 1465
Modified:
trunk/concordance/src/Core.h
trunk/concordance/src/utils.h
Log:
move conChannel to utils.h for now
Modified: trunk/concordance/src/Core.h
===================================================================
--- trunk/concordance/src/Core.h 2009-01-11 23:12:04 UTC (rev 1464)
+++ trunk/concordance/src/Core.h 2009-01-11 23:46:06 UTC (rev 1465)
@@ -19,36 +19,13 @@
# $Id$
*/
-#ifndef CONCORE_H
-#define CONCORE_H
+#ifndef CONCORD_CORE_H
+#define CONCORD_CORE_H
-#include "Python.h"
-#include "glib.h"
-#include "gsasl.h"
-#include "expat.h"
-
-#ifdef MS_WINDOWS
- #include <ws2tcpip.h>
- #include <Winsock2.h>
- WSADATA wsaData;
- gboolean wsaInit;
-#else
- #include <sys/socket.h>
- #include <netdb.h>
-#endif
-
#include "utils.h"
typedef struct {
- GIOChannel* chan;
- const gchar* addr;
- gushort port;
- int sock;
-} conChannel;
-
-
-typedef struct {
PyObject_HEAD
conChannel c2s; /* xmpp-client listening port */
conChannel s2s; /* xmpp-server listening port */
Modified: trunk/concordance/src/utils.h
===================================================================
--- trunk/concordance/src/utils.h 2009-01-11 23:12:04 UTC (rev 1464)
+++ trunk/concordance/src/utils.h 2009-01-11 23:46:06 UTC (rev 1465)
@@ -37,6 +37,13 @@
#include <netdb.h>
#endif
+typedef struct {
+ GIOChannel* chan;
+ const gchar* addr;
+ gushort port;
+ int sock;
+} conChannel;
+
GIOChannel* concordAddSocket (gint fd, GIOCondition condition,
GSourceFunc callback, gpointer data,
GMainContext* context);
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
