The only file that needed the only remaining definition was config.c,
so there's no point keeping a header file around for a single #define
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
---
Makefile.am | 1 -
os/config.c | 3 +++
os/config.h | 54 ------------------------------------------------------
3 files changed, 3 insertions(+), 55 deletions(-)
delete mode 100644 os/config.h
diff --git a/Makefile.am b/Makefile.am
index b092079..63b6e5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,6 @@ xfs_SOURCES = \
difs/tables.c \
os/access.c \
os/config.c \
- os/config.h \
os/configstr.h \
os/connection.c \
os/daemon.c \
diff --git a/os/config.c b/os/config.c
index 67bc7ad..bf2c47e 100644
--- a/os/config.c
+++ b/os/config.c
@@ -106,6 +106,9 @@ static ConfigOptionRec config_options[] = {
{NULL, NULL},
};
+/* max size in bytes of config file */
+#define CONFIG_MAX_FILESIZE 32767
+
#define CONFIG_ERR_MEMORY "CONFIG: insufficient memory to load
configuration file \"%s\"\n"
#define CONFIG_ERR_OPEN "CONFIG: can't open configuration file \"%s\"\n"
#define CONFIG_ERR_READ "CONFIG: error reading configuration file
\"%s\"\n"
diff --git a/os/config.h b/os/config.h
deleted file mode 100644
index 327047d..0000000
--- a/os/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 1987, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * Copyright 1990, 1991 Network Computing Devices;
- * Portions Copyright 1987 by Digital Equipment Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of Network Computing Devices,
- * or Digital not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Network Computing Devices, or Digital
- * make no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * NETWORK COMPUTING DEVICES, AND DIGITAL DISCLAIM ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES, OR DIGITAL BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
-
-/* max size in bytes of config file */
-#define CONFIG_MAX_FILESIZE 32767
-
-#endif /* _CONFIG_H_ */
--
1.7.3.2
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
