[srm-cvs] CVS Update: - Fix include file mess

From: <d.rethans[@]jdimedia.nl>
Date: Sat Jan 18 2003 - 17:11:31 CET

Date: Sat Jan 18 17:11:31 CET 2003
User: Derick Rethans
Directory: srm/modules/skeleton

Log Message:
 [0.75]
 - Fix include file mess
 
Modified files:
           srm/Makefile.am (version: 1.9)
           srm/main/main.c (version: 1.65)
           srm/main/srm_config.h.in (version: 1.27)
           srm/main/src/srm_client.h (version: 1.26)
           srm/main/src/srm_compat.c (version: 1.16)
           srm/main/src/srm_modules.c (version: 1.67)
           srm/main/src/srm_value.h (version: 1.53)
           srm/modules/auth/auth.c (version: 1.25)
           srm/modules/http/http.c (version: 1.42)
           srm/modules/mhttp/mhttp.c (version: 1.13)
           srm/modules/skeleton/skeleton.c (version: 1.5)

[FILE: /srm/Makefile.am]

--- srm/Makefile.am:1.8 Sun Jul 07 01:57:44 2002 GMT
+++ srm/Makefile.am Sat Jan 18 15:11:27 2003 GMT
@@ -1,4 +1,4 @@
-## $Id: cvstemp,v 1.8 2002/07/07 03:57:44 sniper Exp $
+## $Id: cvstemp,v 1.9 2003/01/18 16:11:27 derick Exp $
 ##
 ## Use automake to create Makefile.in
 ##
@@ -25,5 +25,4 @@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = modules main test
 
-include_HEADERS = config.h
 bin_SCRIPTS = srm-config

[FILE: /srm/main/main.c]

--- srm/main/main.c:1.64 Sun Dec 29 20:03:27 2002 GMT
+++ srm/main/main.c Sat Jan 18 15:11:28 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.64 2002/12/29 21:03:27 derick Exp $ */
+/* $Id: cvstemp,v 1.65 2003/01/18 16:11:28 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <signal.h>
 
+#include "config.h"
 #include "srm_compat.h"
 #include "srm_config.h"
 #include "connection.h"

[FILE: /srm/main/srm_config.h.in]

--- srm/main/srm_config.h.in:1.26 Sun Aug 25 10:04:30 2002 GMT
+++ srm/main/srm_config.h.in Sat Jan 18 15:11:28 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.26 2002/08/25 12:04:30 derick Exp $ */
+/* $Id: cvstemp,v 1.27 2003/01/18 16:11:28 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -23,8 +23,6 @@
 
 #ifndef __SRM_CONFIG_H__
 #define __SRM_CONFIG_H__
-
-#include "config.h"
 
 #ifdef HAVE_DMALLOC
 #include <dmalloc.h>

[FILE: /srm/main/src/srm_client.h]

--- srm/main/src/srm_client.h:1.25 Sun Aug 25 10:04:32 2002 GMT
+++ srm/main/src/srm_client.h Sat Jan 18 15:11:29 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.25 2002/08/25 12:04:32 derick Exp $ */
+/* $Id: cvstemp,v 1.26 2003/01/18 16:11:29 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -22,7 +22,6 @@
 #ifndef __SRM_CLIENT_H__
 #define __SRM_CLIENT_H__
 
-#include "config.h"
 #include "functions.h"
 #include "srm_com.h"
 #include "srm_compat.h"

[FILE: /srm/main/src/srm_compat.c]

--- srm/main/src/srm_compat.c:1.15 Tue Feb 19 17:42:50 2002 GMT
+++ srm/main/src/srm_compat.c Sat Jan 18 15:11:29 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.15 2002/02/19 18:42:50 derick Exp $ */
+/* $Id: cvstemp,v 1.16 2003/01/18 16:11:29 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -32,6 +32,7 @@
 #include <netdb.h>
 #include <unistd.h>
 
+#include "config.h"
 #include "srm_modules.h"
 #include "srm_config.h"
 #include "srm_value.h"
@@ -55,17 +56,6 @@
         }
         return temp;
 }
-
-#if defined(SRM_DEBUG) && !defined(HAVE_DMALLOC)
-inline void srm_free (void *ptr)
-{
- if (ptr == NULL)
- abort();
-#undef free
- free (ptr);
- ptr = NULL;
-}
-#endif
 
 void srm_sleep (int sec, int usec)
 {

[FILE: /srm/main/src/srm_modules.c]

--- srm/main/src/srm_modules.c:1.66 Sun Jul 07 17:22:43 2002 GMT
+++ srm/main/src/srm_modules.c Sat Jan 18 15:11:29 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.66 2002/07/07 19:22:43 derick Exp $ */
+/* $Id: cvstemp,v 1.67 2003/01/18 16:11:29 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -27,6 +27,7 @@
 #include <pthread.h>
 #include <signal.h>
 
+#include "config.h"
 #include "ini_parser.h"
 #include "srm_compat.h"
 #include "srm_modules.h"

[FILE: /srm/main/src/srm_value.h]

--- srm/main/src/srm_value.h:1.52 Sun Aug 25 10:04:32 2002 GMT
+++ srm/main/src/srm_value.h Sat Jan 18 15:11:29 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.52 2002/08/25 12:04:32 derick Exp $ */
+/* $Id: cvstemp,v 1.53 2003/01/18 16:11:29 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -48,26 +48,14 @@
 
 /* {{{ Datatypes */
 /* Integer types */
-#if SIZEOF_CHAR == 1
 typedef char srm_si8;
 typedef unsigned char srm_ui8;
-#else
-#error size of char is not known
-#endif
 
-#if SIZEOF_SHORT == 2
 typedef short srm_si16;
 typedef unsigned short srm_ui16;
-#else
-#error size of short is not known
-#endif
 
-#if SIZEOF_LONG == 4
 typedef long srm_si32;
 typedef unsigned long srm_ui32;
-#else
-#error size of long is not known
-#endif
 
 /* Floating point types */
 typedef long double srm_float;

[FILE: /srm/modules/auth/auth.c]

--- srm/modules/auth/auth.c:1.24 Sun Aug 25 10:04:34 2002 GMT
+++ srm/modules/auth/auth.c Sat Jan 18 15:11:30 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.24 2002/08/25 12:04:34 derick Exp $ */
+/* $Id: cvstemp,v 1.25 2003/01/18 16:11:30 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -30,6 +30,7 @@
 #include <fcntl.h>
 #include <ctype.h>
 
+#include "config.h"
 #include "ini_parser.h"
 #include "srm_compat.h"
 #include "srm_config.h"

[FILE: /srm/modules/http/http.c]

--- srm/modules/http/http.c:1.41 Sat Feb 23 18:14:17 2002 GMT
+++ srm/modules/http/http.c Sat Jan 18 15:11:30 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.41 2002/02/23 19:14:17 kalowsky Exp $ */
+/* $Id: cvstemp,v 1.42 2003/01/18 16:11:30 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -29,6 +29,7 @@
 #include <netdb.h>
 #include <unistd.h>
 
+#include "config.h"
 #include "ini_parser.h"
 #include "srm_com.h"
 #include "srm_compat.h"

[FILE: /srm/modules/mhttp/mhttp.c]

--- srm/modules/mhttp/mhttp.c:1.12 Sat Sep 21 04:48:49 2002 GMT
+++ srm/modules/mhttp/mhttp.c Sat Jan 18 15:11:30 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.12 2002/09/21 06:48:49 sniper Exp $ */
+/* $Id: cvstemp,v 1.13 2003/01/18 16:11:30 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -34,6 +34,7 @@
 #include <unistd.h>
 #include <ctype.h>
 
+#include "config.h"
 #include "ini_parser.h"
 #include "srm_com.h"
 #include "srm_compat.h"

[FILE: /srm/modules/skeleton/skeleton.c]

--- srm/modules/skeleton/skeleton.c:1.4 Sun Feb 24 20:07:24 2002 GMT
+++ srm/modules/skeleton/skeleton.c Sat Jan 18 15:11:31 2003 GMT
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <pthread.h>
 
+#include "config.h"
 #include "ini_parser.h"
 #include "srm_com.h"
 #include "srm_compat.h"
Received on Sat Jan 18 17:11:38 2003

This archive was generated by hypermail 2.1.8 : Tue Jan 06 2009 - 12:00:03 CET