[Ayttm-commits] CVS: ayttm/modules/icq/libicq icqconfig.h,NONE,1.1 Makefile.am,1.1.1.1,1.2 config.c,1.1.1.1,1.2 libicq.c,1.2,1.3 config.h,1.1.1.1,NONE

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/icq/libicq
In directory subversions:/tmp/cvs-serv10345/modules/icq/libicq

Modified Files:
        Makefile.am config.c libicq.c 
Added Files:
        icqconfig.h 
Removed Files:
        config.h 
Log Message:
change config.h to icqconfig.h


--- NEW FILE: icqconfig.h ---
/* Copyright (C) 1998 Sean Gabriel <address@hidden>

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; either version 2 of the License, or
(at your option) any later version.

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.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */


#ifndef __FILE_IO_H__
#define __FILE_IO_H__

int Get_Config_Info();
int Read_ICQ_RC(char* filename);
void Write_ICQ_RC(char* filename);
int Read_Contacts_RC(char* filename);
void Write_Contacts_RC(char* filename);

#endif /* __FILE_IO_H__ */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.am 23 Dec 2002 22:04:39 -0000      1.1.1.1
+++ Makefile.am 12 Jan 2003 00:05:47 -0000      1.2
@@ -14,7 +14,7 @@
        receive.h               \
        send.h                  \
        tcp.h                   \
-       config.h                \
+       icqconfig.h             \
        util.h                  \
        icqfile.c
 

Index: config.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/config.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- config.c    23 Dec 2002 22:04:39 -0000      1.1.1.1
+++ config.c    12 Jan 2003 00:05:47 -0000      1.2
@@ -30,7 +30,7 @@
 #endif
 
 #include "libicq.h"
-#include "config.h"
+#include "icqconfig.h"
 #include "tcp.h"
 
 extern int Verbose;

Index: libicq.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/libicq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libicq.c    11 Jan 2003 14:52:16 -0000      1.2
+++ libicq.c    12 Jan 2003 00:05:47 -0000      1.3
@@ -15,10 +15,7 @@
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-/* FIXME - because there is a local file named config.h, we include
-       the relative path to get the one we want
-*/
-#include "../../../config.h"
+#include "config.h"
 #endif
 
 #include <errno.h> 
@@ -52,7 +49,7 @@
 #include "receive.h"
 #include "tcp.h"
 #include "util.h"
-#include "config.h"
+#include "icqconfig.h"
 
 
 void TCP_SendMessages(Contact_Member* c);

--- config.h DELETED ---