Fabio Berton | efa5849 | 2015-10-26 13:22:07 -0200 | [diff] [blame] | 1 | Upstream-Status: Inappropriate [configuration] |
| 2 | |
| 3 | Subject: [PATCH 3/5] Use gsm_config. header instead of config.h |
| 4 | Organization: O.S. Systems Software LTDA. |
| 5 | |
| 6 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
| 7 | --- |
| 8 | Makefile | 2 +- |
| 9 | inc/config.h | 37 ------------------------------------- |
| 10 | inc/gsm_config.h | 37 +++++++++++++++++++++++++++++++++++++ |
| 11 | inc/toast.h | 2 +- |
| 12 | src/code.c | 2 +- |
| 13 | src/gsm_create.c | 2 +- |
| 14 | src/gsm_destroy.c | 2 +- |
| 15 | tls/taste.c | 2 +- |
| 16 | 8 files changed, 43 insertions(+), 43 deletions(-) |
| 17 | delete mode 100644 inc/config.h |
| 18 | create mode 100644 inc/gsm_config.h |
| 19 | |
| 20 | diff --git a/Makefile b/Makefile |
| 21 | index 410d3f6..c8c5b58 100644 |
| 22 | --- a/Makefile |
| 23 | +++ b/Makefile |
| 24 | @@ -152,7 +152,7 @@ GSM_HEADERS = $(INC)/gsm.h |
Holger Hans Peter Freyther | b49f512 | 2011-11-11 21:36:15 +0800 | [diff] [blame] | 25 | |
| 26 | HEADERS = $(INC)/proto.h \ |
| 27 | $(INC)/unproto.h \ |
| 28 | - $(INC)/config.h \ |
| 29 | + $(INC)/gsm_config.h \ |
| 30 | $(INC)/private.h \ |
| 31 | $(INC)/gsm.h \ |
| 32 | $(INC)/toast.h \ |
Fabio Berton | efa5849 | 2015-10-26 13:22:07 -0200 | [diff] [blame] | 33 | diff --git a/inc/config.h b/inc/config.h |
| 34 | deleted file mode 100644 |
| 35 | index dfb1ead..0000000 |
| 36 | --- a/inc/config.h |
| 37 | +++ /dev/null |
Holger Hans Peter Freyther | b49f512 | 2011-11-11 21:36:15 +0800 | [diff] [blame] | 38 | @@ -1,37 +0,0 @@ |
| 39 | -/* |
| 40 | - * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische |
| 41 | - * Universitaet Berlin. See the accompanying file "COPYRIGHT" for |
| 42 | - * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. |
| 43 | - */ |
| 44 | - |
| 45 | -/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/config.h,v 1.5 1996/07/02 11:26:20 jutta Exp $*/ |
| 46 | - |
| 47 | -#ifndef CONFIG_H |
| 48 | -#define CONFIG_H |
| 49 | - |
| 50 | -/*efine SIGHANDLER_T int /* signal handlers are void */ |
| 51 | -/*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */ |
| 52 | - |
| 53 | -#define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ |
| 54 | -#define HAS_LIMITS_H 1 /* /usr/include/limits.h */ |
| 55 | -#define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ |
| 56 | -#define HAS_ERRNO_DECL 1 /* errno.h declares errno */ |
| 57 | - |
| 58 | -#define HAS_FSTAT 1 /* fstat syscall */ |
| 59 | -#define HAS_FCHMOD 1 /* fchmod syscall */ |
| 60 | -#define HAS_CHMOD 1 /* chmod syscall */ |
| 61 | -#define HAS_FCHOWN 1 /* fchown syscall */ |
| 62 | -#define HAS_CHOWN 1 /* chown syscall */ |
| 63 | -/*efine HAS__FSETMODE 1 /* _fsetmode -- set file mode */ |
| 64 | - |
| 65 | -#define HAS_STRING_H 1 /* /usr/include/string.h */ |
| 66 | -/*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */ |
| 67 | - |
| 68 | -#define HAS_UNISTD_H 1 /* /usr/include/unistd.h */ |
| 69 | -#define HAS_UTIME 1 /* POSIX utime(path, times) */ |
| 70 | -/*efine HAS_UTIMES 1 /* use utimes() syscall instead */ |
| 71 | -#define HAS_UTIME_H 1 /* UTIME header file */ |
| 72 | -#define HAS_UTIMBUF 1 /* struct utimbuf */ |
| 73 | -/*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */ |
| 74 | - |
| 75 | -#endif /* CONFIG_H */ |
Fabio Berton | efa5849 | 2015-10-26 13:22:07 -0200 | [diff] [blame] | 76 | diff --git a/inc/gsm_config.h b/inc/gsm_config.h |
| 77 | new file mode 100644 |
| 78 | index 0000000..28cee6d |
| 79 | --- /dev/null |
| 80 | +++ b/inc/gsm_config.h |
Holger Hans Peter Freyther | b49f512 | 2011-11-11 21:36:15 +0800 | [diff] [blame] | 81 | @@ -0,0 +1,37 @@ |
| 82 | +/* |
| 83 | + * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische |
| 84 | + * Universitaet Berlin. See the accompanying file "COPYRIGHT" for |
| 85 | + * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. |
| 86 | + */ |
| 87 | + |
| 88 | +/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/config.h,v 1.5 1996/07/02 11:26:20 jutta Exp $*/ |
| 89 | + |
| 90 | +#ifndef CONFIG_H |
| 91 | +#define CONFIG_H |
| 92 | + |
| 93 | +/*efine SIGHANDLER_T int -* signal handlers are void */ |
| 94 | +/*efine HAS_SYSV_SIGNAL 1 -* sigs not blocked/reset? */ |
| 95 | + |
| 96 | +#define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ |
| 97 | +#define HAS_STDIO_H 1 /* /usr/include/stdio.h */ |
| 98 | +/*efine HAS_LIMITS_H 1 -* /usr/include/limits.h */ |
| 99 | +#define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ |
| 100 | + |
| 101 | +#define HAS_FSTAT 1 /* fstat syscall */ |
| 102 | +#define HAS_FCHMOD 1 /* fchmod syscall */ |
| 103 | +#define HAS_CHMOD 1 /* chmod syscall */ |
| 104 | +#define HAS_FCHOWN 1 /* fchown syscall */ |
| 105 | +#define HAS_CHOWN 1 /* chown syscall */ |
| 106 | +/*efine HAS__FSETMODE 1 -* _fsetmode -- set file mode */ |
| 107 | + |
| 108 | +#define HAS_STRING_H 1 /* /usr/include/string.h */ |
| 109 | +/*efine HAS_STRINGS_H 1 -* /usr/include/strings.h */ |
| 110 | + |
| 111 | +#define HAS_UNISTD_H 1 /* /usr/include/unistd.h */ |
| 112 | +#define HAS_UTIME 1 /* POSIX utime(path, times) */ |
| 113 | +/*efine HAS_UTIMES 1 -* use utimes() syscall instead */ |
| 114 | +#define HAS_UTIME_H 1 /* UTIME header file */ |
| 115 | +/*efine HAS_UTIMBUF 1 -* struct utimbuf */ |
| 116 | +/*efine HAS_UTIMEUSEC 1 -* microseconds in utimbuf? */ |
| 117 | + |
| 118 | +#endif /* CONFIG_H */ |
Fabio Berton | efa5849 | 2015-10-26 13:22:07 -0200 | [diff] [blame] | 119 | diff --git a/inc/toast.h b/inc/toast.h |
| 120 | index b42d9ae..911769d 100644 |
| 121 | --- a/inc/toast.h |
| 122 | +++ b/inc/toast.h |
Holger Hans Peter Freyther | b49f512 | 2011-11-11 21:36:15 +0800 | [diff] [blame] | 123 | @@ -9,7 +9,7 @@ |
| 124 | #ifndef TOAST_H |
| 125 | #define TOAST_H /* Guard against multiple includes */ |
| 126 | |
| 127 | -#include "config.h" |
| 128 | +#include "gsm_config.h" |
| 129 | |
| 130 | #include <sys/types.h> |
| 131 | #include <sys/stat.h> |
Fabio Berton | efa5849 | 2015-10-26 13:22:07 -0200 | [diff] [blame] | 132 | diff --git a/src/code.c b/src/code.c |
| 133 | index 402f614..5222727 100644 |
| 134 | --- a/src/code.c |
| 135 | +++ b/src/code.c |
Holger Hans Peter Freyther | b49f512 | 2011-11-11 21:36:15 +0800 | [diff] [blame] | 136 | @@ -6,7 +6,7 @@ |
| 137 | |
| 138 | /* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/code.c,v 1.3 1996/07/02 09:59:05 jutta Exp $ */ |
| 139 | |
| 140 | -#include "config.h" |
| 141 | +#include "gsm_config.h" |
| 142 | |
| 143 | |
Fabio Berton | efa5849 | 2015-10-26 13:22:07 -0200 | [diff] [blame] | 144 | #ifdef HAS_STRING_H |
| 145 | diff --git a/src/gsm_create.c b/src/gsm_create.c |
| 146 | index a0bf634..9cc2670 100644 |
| 147 | --- a/src/gsm_create.c |
| 148 | +++ b/src/gsm_create.c |
Holger Hans Peter Freyther | b49f512 | 2011-11-11 21:36:15 +0800 | [diff] [blame] | 149 | @@ -6,7 +6,7 @@ |
| 150 | |
| 151 | static char const ident[] = "$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_create.c,v 1.4 1996/07/02 09:59:05 jutta Exp $"; |
| 152 | |
| 153 | -#include "config.h" |
| 154 | +#include "gsm_config.h" |
| 155 | |
| 156 | #ifdef HAS_STRING_H |
| 157 | #include <string.h> |
Fabio Berton | efa5849 | 2015-10-26 13:22:07 -0200 | [diff] [blame] | 158 | diff --git a/src/gsm_destroy.c b/src/gsm_destroy.c |
| 159 | index 03c8659..274dc4c 100644 |
| 160 | --- a/src/gsm_destroy.c |
| 161 | +++ b/src/gsm_destroy.c |
Holger Hans Peter Freyther | b49f512 | 2011-11-11 21:36:15 +0800 | [diff] [blame] | 162 | @@ -7,7 +7,7 @@ |
| 163 | /* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_destroy.c,v 1.3 1994/11/28 19:52:25 jutta Exp $ */ |
| 164 | |
| 165 | #include "gsm.h" |
| 166 | -#include "config.h" |
| 167 | +#include "gsm_config.h" |
| 168 | #include "proto.h" |
| 169 | |
| 170 | #ifdef HAS_STDLIB_H |
Fabio Berton | efa5849 | 2015-10-26 13:22:07 -0200 | [diff] [blame] | 171 | diff --git a/tls/taste.c b/tls/taste.c |
| 172 | index 4bc84ad..56d1a93 100644 |
| 173 | --- a/tls/taste.c |
| 174 | +++ b/tls/taste.c |
Holger Hans Peter Freyther | b49f512 | 2011-11-11 21:36:15 +0800 | [diff] [blame] | 175 | @@ -10,7 +10,7 @@ |
| 176 | #include <string.h> |
| 177 | #include <memory.h> |
| 178 | |
| 179 | -#include "config.h" |
| 180 | +#include "gsm_config.h" |
| 181 | |
| 182 | #ifdef HAS_STDLIB_H |
| 183 | # include <stdlib.h> |
Fabio Berton | efa5849 | 2015-10-26 13:22:07 -0200 | [diff] [blame] | 184 | -- |
| 185 | 2.1.4 |
| 186 | |