taskrambler / taskrambler · Commits

Commit dd9d49d5a99516957618f155ce1ecfd51678c586

Authored by Georg Hopp
1 parent dd9eae7e

made all class and interface basics to a small lib. This is the first one. All o… 

…ther parts will become libs too. Right now these are only static libs but this way its easy to split them out if needed
Inline Side-by-side
Showing 56 changed files with 173 additions and 179 deletions
... ... @@ -38,5 +38,5 @@ AC_TYPE_SIZE_T
38 38 #AC_FUNC_MALLOC
39 39 AC_CHECK_FUNCS([memset])
40 40
41   -AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
  41 +AC_CONFIG_FILES([Makefile src/Makefile src/class/Makefile tests/Makefile])
42 42 AC_OUTPUT
... ...
1   -/**
2   - * \file
3   - * My own class implementation for C. It combines a data structure
4   - * with a set of dynamically linked methods defined by an interface. A
5   - * dynamically linked method will be called via a selector method which in
6   - * turn gets the implementation stored in the class.
7   - *
8   - * \author Georg Hopp
9   - *
10   - * \copyright
11   - * Copyright © 2012 Georg Hopp
12   - *
13   - * This program is free software: you can redistribute it and/or modify
14   - * it under the terms of the GNU General Public License as published by
15   - * the Free Software Foundation, either version 3 of the License, or
16   - * (at your option) any later version.
17   - *
18   - * This program is distributed in the hope that it will be useful,
19   - * but WITHOUT ANY WARRANTY; without even the implied warranty of
20   - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21   - * GNU General Public License for more details.
22   - *
23   - * You should have received a copy of the GNU General Public License
24   - * along with this program. If not, see <http://www.gnu.org/licenses/>.
25   - */
26   -
27 1 #ifndef __CLASS_H__
28 2 #define __CLASS_H__
29 3
30   -#include <stdarg.h>
31   -#include <sys/types.h>
32   -#include <string.h>
33   -#include <assert.h>
34   -
35   -#include "interface.h"
36   -
37   -#ifndef _ISOC99_SOURCE
38   -#define _ISOC99_SOURCE
39   -#endif
40   -
41   -#define CLASS_MAGIC 0xFEFE
42   -
43   -#define CLASS(name) \
44   - struct c_##name; \
45   - typedef struct c_##name * name; \
46   - extern struct class * const _##name; \
47   - struct c_##name
48   -
49   -#define EXTENDS(parent) \
50   - const char _[sizeof(struct c_##parent)]
51   -
52   -#define _NULL NULL
53   -#define CREATE_CLASS(name,_parent,...) \
54   - static struct class c_##name; \
55   - static class_ptr _classInit_(void) { \
56   - c_##name.parent = _##_parent; \
57   - c_##name.init = NULL; \
58   - return &c_##name; \
59   - } \
60   - static struct class c_##name = { \
61   - CLASS_MAGIC, \
62   - NULL, \
63   - sizeof(struct c_##name), \
64   - _classInit_, \
65   - INIT_IFACE_IMPL(__VA_ARGS__) \
66   - }; struct class * const _##name = &c_##name
67   -
68   -#define INIT_CLASS(class) ((class)->init? (class)->init() : (class))
69   -#define GET_CLASS(object) (INIT_CLASS(*(class_ptr *)((object) - sizeof(void*))))
70   -#define IFACE_GET(class,iface) (interfaceGet(&((class)->impl),(iface)))
71   -#define HAS_PARENT(class) (NULL != ((class)->parent) && INIT_CLASS((class)->parent))
72   -
73   -/**
74   - * \todo actually i use gcc feature ## for variadoc... think about
75   - * a way to make this standard.
76   - */
77   -#define _CALL(_class,_iface,method,...) \
78   - do { \
79   - class_ptr class = _class; \
80   - iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface); \
81   - while ((NULL == iface || NULL == iface->method) && HAS_PARENT(class)) { \
82   - class = class->parent; \
83   - iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface); \
84   - } \
85   - assert(NULL != iface->method); \
86   - } while(0)
87   -
88   -#define CALL(object,_iface,method,...) \
89   - do { \
90   - struct i_##_iface * iface; \
91   - _CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
92   - iface->method(object, ##__VA_ARGS__); \
93   - } while(0)
94   -
95   -#define RETCALL(object,_iface,method,ret,...) \
96   - do { \
97   - struct i_##_iface * iface; \
98   - _CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
99   - ret = iface->method(object, ##__VA_ARGS__); \
100   - } while(0)
101   -
102   -#define PARENTCALL(object,_iface,method,...) \
103   - do { \
104   - struct i_##_iface * iface; \
105   - class_ptr pc_class = GET_CLASS((object)); \
106   - assert(HAS_PARENT(pc_class)); \
107   - _CALL(pc_class->parent, _iface, method, ##__VA_ARGS__); \
108   - iface->method(object, ##__VA_ARGS__); \
109   - } while(0)
110   -
111   -
112   -struct class;
113   -typedef struct class * class_ptr;
114   -typedef class_ptr (* fptr_classInit)(void);
115   -struct class {
116   - const int magic;
117   - class_ptr parent;
118   - size_t object_size;
119   - fptr_classInit init;
120   - struct iface_impl impl;
121   -};
  4 +#include "class/class.h"
  5 +#include "class/interface.h"
  6 +#include "class/interface/class.h"
122 7
123 8 #endif // __CLASS_H__
124 9
... ...
  1 +/**
  2 + * \file
  3 + * My own class implementation for C. It combines a data structure
  4 + * with a set of dynamically linked methods defined by an interface. A
  5 + * dynamically linked method will be called via a selector method which in
  6 + * turn gets the implementation stored in the class.
  7 + *
  8 + * \author Georg Hopp
  9 + *
  10 + * \copyright
  11 + * Copyright © 2012 Georg Hopp
  12 + *
  13 + * This program is free software: you can redistribute it and/or modify
  14 + * it under the terms of the GNU General Public License as published by
  15 + * the Free Software Foundation, either version 3 of the License, or
  16 + * (at your option) any later version.
  17 + *
  18 + * This program is distributed in the hope that it will be useful,
  19 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  20 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  21 + * GNU General Public License for more details.
  22 + *
  23 + * You should have received a copy of the GNU General Public License
  24 + * along with this program. If not, see <http://www.gnu.org/licenses/>.
  25 + */
  26 +
  27 +#ifndef __CLASS_CLASS_H__
  28 +#define __CLASS_CLASS_H__
  29 +
  30 +#include <stdarg.h>
  31 +#include <sys/types.h>
  32 +#include <string.h>
  33 +#include <assert.h>
  34 +
  35 +#include "class/interface.h"
  36 +
  37 +#ifndef _ISOC99_SOURCE
  38 +#define _ISOC99_SOURCE
  39 +#endif
  40 +
  41 +#define CLASS_MAGIC 0xFEFE
  42 +
  43 +#define CLASS(name) \
  44 + struct c_##name; \
  45 + typedef struct c_##name * name; \
  46 + extern struct class * const _##name; \
  47 + struct c_##name
  48 +
  49 +#define EXTENDS(parent) \
  50 + const char _[sizeof(struct c_##parent)]
  51 +
  52 +#define _NULL NULL
  53 +#define CREATE_CLASS(name,_parent,...) \
  54 + static struct class c_##name; \
  55 + static class_ptr _classInit_(void) { \
  56 + c_##name.parent = _##_parent; \
  57 + c_##name.init = NULL; \
  58 + return &c_##name; \
  59 + } \
  60 + static struct class c_##name = { \
  61 + CLASS_MAGIC, \
  62 + NULL, \
  63 + sizeof(struct c_##name), \
  64 + _classInit_, \
  65 + INIT_IFACE_IMPL(__VA_ARGS__) \
  66 + }; struct class * const _##name = &c_##name
  67 +
  68 +#define INIT_CLASS(class) ((class)->init? (class)->init() : (class))
  69 +#define GET_CLASS(object) (INIT_CLASS(*(class_ptr *)((object) - sizeof(void*))))
  70 +#define IFACE_GET(class,iface) (interfaceGet(&((class)->impl),(iface)))
  71 +#define HAS_PARENT(class) (NULL != ((class)->parent) && INIT_CLASS((class)->parent))
  72 +
  73 +/**
  74 + * \todo actually i use gcc feature ## for variadoc... think about
  75 + * a way to make this standard.
  76 + */
  77 +#define _CALL(_class,_iface,method,...) \
  78 + do { \
  79 + class_ptr class = _class; \
  80 + iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface); \
  81 + while ((NULL == iface || NULL == iface->method) && HAS_PARENT(class)) { \
  82 + class = class->parent; \
  83 + iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface); \
  84 + } \
  85 + assert(NULL != iface->method); \
  86 + } while(0)
  87 +
  88 +#define CALL(object,_iface,method,...) \
  89 + do { \
  90 + struct i_##_iface * iface; \
  91 + _CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
  92 + iface->method(object, ##__VA_ARGS__); \
  93 + } while(0)
  94 +
  95 +#define RETCALL(object,_iface,method,ret,...) \
  96 + do { \
  97 + struct i_##_iface * iface; \
  98 + _CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
  99 + ret = iface->method(object, ##__VA_ARGS__); \
  100 + } while(0)
  101 +
  102 +#define PARENTCALL(object,_iface,method,...) \
  103 + do { \
  104 + struct i_##_iface * iface; \
  105 + class_ptr pc_class = GET_CLASS((object)); \
  106 + assert(HAS_PARENT(pc_class)); \
  107 + _CALL(pc_class->parent, _iface, method, ##__VA_ARGS__); \
  108 + iface->method(object, ##__VA_ARGS__); \
  109 + } while(0)
  110 +
  111 +
  112 +struct class;
  113 +typedef struct class * class_ptr;
  114 +typedef class_ptr (* fptr_classInit)(void);
  115 +struct class {
  116 + const int magic;
  117 + class_ptr parent;
  118 + size_t object_size;
  119 + fptr_classInit init;
  120 + struct iface_impl impl;
  121 +};
  122 +
  123 +#endif // __CLASS_CLASS_H__
  124 +
  125 +// vim: set ts=4 sw=4:
... ...
... ... @@ -24,8 +24,8 @@
24 24 * along with this program. If not, see <http://www.gnu.org/licenses/>.
25 25 */
26 26
27   -#ifndef __INTERFACE_H__
28   -#define __INTERFACE_H__
  27 +#ifndef __CLASS_INTERFACE_H__
  28 +#define __CLASS_INTERFACE_H__
29 29
30 30 #include <sys/types.h>
31 31
... ... @@ -54,6 +54,6 @@ typedef struct iface_impl * iface_impl_ptr;
54 54
55 55 extern iface_ptr interfaceGet(iface_impl_ptr, const iface_ptr);
56 56
57   -#endif // __INTERFACE_H__
  57 +#endif // __CLASS_INTERFACE_H__
58 58
59 59 // vim: set ts=4 sw=4:
... ...
... ... @@ -23,13 +23,13 @@
23 23 * along with this program. If not, see <http://www.gnu.org/licenses/>.
24 24 */
25 25
26   -#ifndef __INTERFACE_CLASS_H__
27   -#define __INTERFACE_CLASS_H__
  26 +#ifndef __CLASS_INTERFACE_CLASS_H__
  27 +#define __CLASS_INTERFACE_CLASS_H__
28 28
29 29 #include <stdarg.h>
30 30
31   -#include "class.h"
32   -#include "interface.h"
  31 +#include "class/class.h"
  32 +#include "class/interface.h"
33 33
34 34 typedef int (* fptr_ctor)(void *, va_list *);
35 35 typedef void (* fptr_dtor)(void *);
... ... @@ -52,6 +52,6 @@ extern void * classClone(void *);
52 52 #define delete(object) classDelete((void **)&(object))
53 53 #define clone(object) classClone((void *)(object))
54 54
55   -#endif // __INTERFACE_CLASS_H__
  55 +#endif // __CLASS_INTERFACE_CLASS_H__
56 56
57 57 // vim: set ts=4 sw=4:
... ...
... ... @@ -30,7 +30,7 @@
30 30
31 31 #include <stdarg.h>
32 32
33   -#include "interface.h"
  33 +#include "class.h"
34 34 #include "credential.h"
35 35
36 36 typedef int (* fptr_authenticate)(void *, Credential);
... ...
... ... @@ -24,7 +24,7 @@
24 24 #ifndef __INTERFACE_HASHABLE_H__
25 25 #define __INTERFACE_HASHABLE_H__
26 26
27   -#include "interface.h"
  27 +#include "class.h"
28 28
29 29 typedef unsigned long (* fptr_hashableGetHash)(void *);
30 30 typedef void (* fptr_hashableHandleDouble)(void *, void *);
... ...
... ... @@ -26,7 +26,7 @@
26 26
27 27 #include <stdarg.h>
28 28
29   -#include "interface.h"
  29 +#include "class.h"
30 30 #include "logger.h"
31 31
32 32 typedef void (* fptr_log)(void *, logger_level, const char * const);
... ...
1 1 ACLOCAL_AMFLAGS = -I m4
2 2
3   -IFACE = interface/class.c interface/stream_reader.c interface/logger.c \
  3 +IFACE = interface/stream_reader.c interface/logger.c \
4 4 interface/stream_writer.c interface/http_intro.c \
5   - interface/subject.c interface/observer.c interface.c
  5 + interface/subject.c interface/observer.c
6 6 SOCKET = socket.c socket/accept.c socket/connect.c socket/listen.c
7 7 STREAM = stream.c stream/read.c stream/write.c
8 8 HASH = hash.c hash/add.c hash/get.c hash/delete.c \
... ... @@ -67,4 +67,6 @@ taskrambler_SOURCES = taskrambler.c \
67 67 $(WRITER) $(RESP) $(HEADER) $(PARSER) $(WORKER) $(CB) \
68 68 $(UTILS) $(MSGQ) $(SESSION) $(STREAM) $(HASH) $(AUTH)
69 69 taskrambler_CFLAGS = -Wall -I ../include/
70   -taskrambler_LDFLAGS = -lrt -lssl -lldap
  70 +taskrambler_LDFLAGS = -L./class -lclass -lrt -lssl -lldap
  71 +
  72 +SUBDIRS = class
... ...
... ... @@ -29,7 +29,6 @@
29 29 #include "auth/ldap.h"
30 30 #include "class.h"
31 31 #include "credential.h"
32   -#include "interface/class.h"
33 32 #include "interface/auth.h"
34 33
35 34 #include "utils/memory.h"
... ...
... ... @@ -34,7 +34,6 @@
34 34 #include <fcntl.h>
35 35
36 36 #include "class.h"
37   -#include "interface/class.h"
38 37 #include "utils/memory.h"
39 38
40 39 #include "cbuf.h"
... ...
  1 +ACLOCAL_AMFLAGS = -I m4
  2 +
  3 +AM_CFLAGS = -Wall -I ../include/
  4 +
  5 +noinst_LIBRARIES = libclass.a
  6 +
  7 +libclass_a_SOURCES = interface.c interface/class.c
  8 +libclass_a_CFLAGS = -Wall -I ../../include/
... ...
... ... @@ -23,7 +23,7 @@
23 23 #include <sys/types.h>
24 24 #include <stdlib.h>
25 25
26   -#include "interface.h"
  26 +#include "class/interface.h"
27 27 #include "commons.h"
28 28
29 29 static
... ...
... ... @@ -24,8 +24,8 @@
24 24 #include <stdlib.h>
25 25 #include <assert.h>
26 26
27   -#include "class.h"
28   -#include "interface/class.h"
  27 +#include "class/class.h"
  28 +#include "class/interface/class.h"
29 29
30 30 const
31 31 struct interface i_Class = {
... ...
No preview for this file type
... ... @@ -27,7 +27,6 @@
27 27
28 28 #include "credential.h"
29 29 #include "class.h"
30   -#include "interface/class.h"
31 30
32 31 #include "utils/memory.h"
33 32
... ...
... ... @@ -27,7 +27,6 @@
27 27
28 28 #include "hash.h"
29 29 #include "class.h"
30   -#include "interface/class.h"
31 30
32 31 static
33 32 int
... ...
... ... @@ -24,7 +24,7 @@
24 24
25 25 #include "hash.h"
26 26 #include "interface/hashable.h"
27   -#include "interface/class.h"
  27 +#include "class.h"
28 28
29 29 static
30 30 inline
... ...
... ... @@ -29,7 +29,7 @@
29 29 #include "utils/hash.h"
30 30 #include "utils/memory.h"
31 31 #include "commons.h"
32   -#include "interface/class.h"
  32 +#include "class.h"
33 33 #include "interface/hashable.h"
34 34
35 35 static
... ...
... ... @@ -26,7 +26,7 @@
26 26 #include <sys/types.h>
27 27
28 28 #include "cookie.h"
29   -#include "interface/class.h"
  29 +#include "class.h"
30 30 #include "interface/hashable"
31 31
32 32 #include "utils/hash.h"
... ...
... ... @@ -25,7 +25,6 @@
25 25 #include <string.h>
26 26
27 27 #include "class.h"
28   -#include "interface/class.h"
29 28 #include "http/header.h"
30 29 #include "interface/hashable.h"
31 30
... ...
... ... @@ -31,7 +31,6 @@
31 31 #include <unistd.h>
32 32
33 33 #include "class.h"
34   -#include "interface/class.h"
35 34 #include "hash.h"
36 35 #include "http/message.h"
37 36 #include "utils/memory.h"
... ...
... ... @@ -23,7 +23,6 @@
23 23 #include <stdarg.h>
24 24
25 25 #include "class.h"
26   -#include "interface/class.h"
27 26
28 27 #include "http/message/queue.h"
29 28
... ...
... ... @@ -25,7 +25,6 @@
25 25 #include <stdarg.h>
26 26
27 27 #include "class.h"
28   -#include "interface/class.h"
29 28 #include "interface/stream_reader.h"
30 29
31 30 #include "http/parser.h"
... ...
... ... @@ -25,7 +25,6 @@
25 25 #include <sys/types.h>
26 26
27 27 #include "class.h"
28   -#include "interface/class.h"
29 28 #include "http/header.h"
30 29 #include "http/parser.h"
31 30 #include "http/message.h"
... ...
... ... @@ -24,7 +24,7 @@
24 24
25 25 #include "http/parser.h"
26 26 #include "http/header.h"
27   -#include "interface/class.h"
  27 +#include "class.h"
28 28 #include "interface/http_intro.h"
29 29 #include "cbuf.h"
30 30 #include "stream.h"
... ...
... ... @@ -27,7 +27,7 @@
27 27 #include "http/request.h"
28 28 #include "hash_value.h"
29 29 #include "hash.h"
30   -#include "interface/class.h"
  30 +#include "class.h"
31 31
32 32 /**
33 33 * \todo this is very similar to other pair parsing
... ...
... ... @@ -28,7 +28,7 @@
28 28 #include "http/request.h"
29 29 #include "hash_value.h"
30 30 #include "hash.h"
31   -#include "interface/class.h"
  31 +#include "class.h"
32 32
33 33 void
34 34 httpParserRequestVars(HttpParser this)
... ...
... ... @@ -26,7 +26,6 @@
26 26 #include <sys/types.h>
27 27
28 28 #include "class.h"
29   -#include "interface/class.h"
30 29 #include "interface/http_intro.h"
31 30
32 31 #include "http/request.h"
... ...
... ... @@ -27,7 +27,6 @@
27 27 #include <stdio.h>
28 28
29 29 #include "class.h"
30   -#include "interface/class.h"
31 30 #include "interface/http_intro.h"
32 31
33 32 #include "http/response.h"
... ...
... ... @@ -23,7 +23,6 @@
23 23 #include <sys/types.h>
24 24
25 25 #include "class.h"
26   -#include "interface/class.h"
27 26
28 27 #include "http/response.h"
29 28 #include "http/message.h"
... ...
... ... @@ -26,7 +26,6 @@
26 26 #include <sys/types.h>
27 27
28 28 #include "class.h"
29   -#include "interface/class.h"
30 29
31 30 #include "http/response.h"
32 31 #include "http/message.h"
... ...
... ... @@ -26,7 +26,6 @@
26 26 #include <sys/types.h>
27 27
28 28 #include "class.h"
29   -#include "interface/class.h"
30 29
31 30 #include "http/response.h"
32 31 #include "http/message.h"
... ...
... ... @@ -28,7 +28,6 @@
28 28 #include <sys/types.h>
29 29
30 30 #include "class.h"
31   -#include "interface/class.h"
32 31 #include "stream.h"
33 32
34 33 #include "http/response.h"
... ...
... ... @@ -27,7 +27,6 @@
27 27 #include <sys/types.h>
28 28
29 29 #include "class.h"
30   -#include "interface/class.h"
31 30
32 31 #include "http/response.h"
33 32 #include "http/message.h"
... ...
... ... @@ -27,7 +27,6 @@
27 27 #include <sys/types.h>
28 28
29 29 #include "class.h"
30   -#include "interface/class.h"
31 30
32 31 #include "http/response.h"
33 32 #include "http/message.h"
... ...
... ... @@ -27,7 +27,6 @@
27 27 #include <sys/types.h>
28 28
29 29 #include "class.h"
30   -#include "interface/class.h"
31 30
32 31 #include "http/response.h"
33 32 #include "http/message.h"
... ...
... ... @@ -34,7 +34,6 @@
34 34 #include "http/parser.h"
35 35 #include "http/writer.h"
36 36
37   -#include "interface/class.h"
38 37 #include "interface/stream_reader.h"
39 38 #include "interface/stream_writer.h"
40 39
... ...
... ... @@ -24,7 +24,6 @@
24 24 #include <sys/types.h>
25 25
26 26 #include "class.h"
27   -#include "interface/class.h"
28 27
29 28 #include "http/message.h"
30 29 #include "http/header.h"
... ...
... ... @@ -28,7 +28,6 @@
28 28 #include <sys/time.h>
29 29
30 30 #include "class.h"
31   -#include "interface/class.h"
32 31 #include "interface/auth.h"
33 32
34 33 #include "http/worker.h"
... ...
... ... @@ -23,7 +23,6 @@
23 23 #include <stdarg.h>
24 24
25 25 #include "class.h"
26   -#include "interface/class.h"
27 26 #include "interface/stream_writer.h"
28 27
29 28 #include "http/message/queue.h"
... ...
... ... @@ -24,7 +24,6 @@
24 24 #include <sys/stat.h>
25 25
26 26 #include "class.h"
27   -#include "interface/class.h"
28 27 #include "http/message.h"
29 28 #include "http/writer.h"
30 29 #include "cbuf.h"
... ...
... ... @@ -23,7 +23,7 @@
23 23 #include <stdarg.h>
24 24
25 25 #include "logger.h"
26   -#include "interface/class.h"
  26 +#include "class.h"
27 27 #include "interface/logger.h"
28 28
29 29 const
... ...
... ... @@ -31,7 +31,6 @@
31 31 #include "server.h"
32 32 #include "socket.h"
33 33 #include "logger.h"
34   -#include "interface/class.h"
35 34
36 35 #include "utils/memory.h"
37 36
... ...
... ... @@ -24,7 +24,7 @@
24 24 #include <string.h>
25 25
26 26 #include "server.h"
27   -#include "interface/class.h"
  27 +#include "class.h"
28 28 #include "stream.h"
29 29
30 30 void
... ...
... ... @@ -28,7 +28,7 @@
28 28
29 29 #include "http/worker.h"
30 30 #include "server.h"
31   -#include "interface/class.h"
  31 +#include "class.h"
32 32 #include "interface/logger.h"
33 33 #include "stream.h"
34 34
... ...
... ... @@ -29,7 +29,6 @@
29 29
30 30 #include "session.h"
31 31 #include "class.h"
32   -#include "interface/class.h"
33 32
34 33 #include "utils/hash.h"
35 34 #include "utils/memory.h"
... ...
... ... @@ -23,7 +23,7 @@
23 23 #include <search.h>
24 24
25 25 #include "session.h"
26   -#include "interface/class.h"
  26 +#include "class.h"
27 27
28 28
29 29 static
... ...
... ... @@ -23,7 +23,7 @@
23 23 #include <search.h>
24 24
25 25 #include "session.h"
26   -#include "interface/class.h"
  26 +#include "class.h"
27 27
28 28
29 29 static
... ...
... ... @@ -26,7 +26,7 @@
26 26
27 27 #include "socket.h"
28 28 #include "logger.h"
29   -#include "interface/class.h"
  29 +#include "class.h"
30 30 #include "interface/logger.h"
31 31
32 32 static
... ...
... ... @@ -24,7 +24,7 @@
24 24 #include <unistd.h>
25 25
26 26 #include "socket.h"
27   -#include "interface/class.h"
  27 +#include "class.h"
28 28 #include "interface/logger.h"
29 29
30 30 Sock
... ...
... ... @@ -24,7 +24,7 @@
24 24 #include <errno.h> // for errno
25 25
26 26 #include "socket.h"
27   -#include "interface/class.h"
  27 +#include "class.h"
28 28 #include "interface/logger.h"
29 29
30 30
... ...
... ... @@ -24,7 +24,7 @@
24 24 #include <errno.h> // for errno
25 25
26 26 #include "socket.h"
27   -#include "interface/class.h"
  27 +#include "class.h"
28 28 #include "interface/logger.h"
29 29
30 30
... ...
... ... @@ -24,7 +24,6 @@
24 24 #include <openssl/ssl.h>
25 25
26 26 #include "class.h"
27   -#include "interface/class.h"
28 27 #include "stream.h"
29 28
30 29
... ...
... ... @@ -40,7 +40,7 @@
40 40 #include "http/worker.h"
41 41 #include "auth/ldap.h"
42 42
43   -#include "interface/class.h"
  43 +#include "class.h"
44 44 #include "interface/logger.h"
45 45
46 46 #include "utils/signalHandling.h"
... ...
... ... @@ -28,7 +28,7 @@
28 28 #include "http/request.h"
29 29 #include "http/response.h"
30 30
31   -#include "interface/class.h"
  31 +#include "class.h"
32 32
33 33 #include "commons.h"
34 34
... ...
Please register or login to post a comment