Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_con
Modified Files:
Ecore_Con.h ecore_con.c ecore_con_private.h ecore_con_url.c
Log Message:
Remove double declarations.
No need to typedef to void.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/Ecore_Con.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- Ecore_Con.h 24 Sep 2006 07:53:47 -0000 1.21
+++ Ecore_Con.h 24 Sep 2006 08:16:01 -0000 1.22
@@ -64,10 +64,9 @@
extern "C" {
#endif
-#ifndef _ECORE_CON_PRIVATE_H
- typedef void Ecore_Con_Server; /**< A connection handle */
- typedef void Ecore_Con_Client; /**< A connection handle */
- typedef void Ecore_Con_Url;
+ typedef struct _Ecore_Con_Server Ecore_Con_Server; /**< A connection handle
*/
+ typedef struct _Ecore_Con_Client Ecore_Con_Client; /**< A connection handle
*/
+ typedef struct _Ecore_Con_Url Ecore_Con_Url;
typedef enum _Ecore_Con_Type
{
@@ -77,8 +76,6 @@
ECORE_CON_REMOTE_SYSTEM,
ECORE_CON_USE_SSL = 16
} Ecore_Con_Type;
-
-#endif
typedef struct _Ecore_Con_Event_Client_Add Ecore_Con_Event_Client_Add;
typedef struct _Ecore_Con_Event_Client_Del Ecore_Con_Event_Client_Del;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/ecore_con.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- ecore_con.c 24 Sep 2006 07:53:47 -0000 1.80
+++ ecore_con.c 24 Sep 2006 08:16:01 -0000 1.81
@@ -17,8 +17,8 @@
#include "Ecore.h"
#include "ecore_private.h"
-#include "ecore_con_private.h"
#include "Ecore_Con.h"
+#include "ecore_con_private.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/ecore_con_private.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ecore_con_private.h 24 Sep 2006 07:53:47 -0000 1.16
+++ ecore_con_private.h 24 Sep 2006 08:16:02 -0000 1.17
@@ -15,23 +15,6 @@
#define READBUFSIZ 65536
-typedef struct _Ecore_Con_Client Ecore_Con_Client;
-typedef struct _Ecore_Con_Server Ecore_Con_Server;
-#ifdef HAVE_CURL
-typedef struct _Ecore_Con_Url Ecore_Con_Url;
-#else
-typedef void Ecore_Con_Url;
-#endif
-
-typedef enum _Ecore_Con_Type
-{
- ECORE_CON_LOCAL_USER,
- ECORE_CON_LOCAL_SYSTEM,
- ECORE_CON_LOCAL_ABSTRACT,
- ECORE_CON_REMOTE_SYSTEM,
- ECORE_CON_USE_SSL = 16
-} Ecore_Con_Type;
-
struct _Ecore_Con_Client
{
Ecore_List __list_data;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/ecore_con_url.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ecore_con_url.c 8 Jan 2006 02:37:50 -0000 1.9
+++ ecore_con_url.c 24 Sep 2006 08:16:02 -0000 1.10
@@ -37,8 +37,8 @@
*/
#include "Ecore.h"
#include "ecore_private.h"
-#include "ecore_con_private.h"
#include "Ecore_Con.h"
+#include "ecore_con_private.h"
#ifdef HAVE_CURL
static int _ecore_con_url_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
