summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Carnecky <tom@dbservice.com>2009-02-04 15:26:18 +0100
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-02-05 21:40:25 -0800
commitd192bac409fe5ef99fa9fb9b5a0d5f656f0f1412 (patch)
treed38a6124cbc04a15a66523046d3e6c79a79dd758
parent77784ae71b6af1ec270198cfdd5f2eab1fe4a0c0 (diff)
downloadxorg-lib-libxtrans-d192bac409fe5ef99fa9fb9b5a0d5f656f0f1412.tar.gz
Fix "XXX declared 'static' but not defined"
The functions are declared static in Xtransint.h but are defined in Xtransutil.c. So when someone (xserver/os/connection.c) incuded Xtransint.h, gcc would throw the warning. I removed the declarations from the header and rearranged includes in transport.c so that Xtransutil.c is included just after Xtransint.h. This way the functions are still defined for the files that need them (Xtranssock.c, Xtranstli.c). Signed-off-by: Tomas Carnecky <tom@dbservice.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-rw-r--r--Xtransint.h12
-rw-r--r--transport.c2
2 files changed, 1 insertions, 13 deletions
diff --git a/Xtransint.h b/Xtransint.h
index 623cdef..e1a95a2 100644
--- a/Xtransint.h
+++ b/Xtransint.h
@@ -345,18 +345,6 @@ static int TRANS(WriteV)(
#endif /* CRAY || WIN32 || __sxg__ */
-
-static int is_numeric (
- char * /* str */
-);
-
-#ifdef TRANS_SERVER
-static int trans_mkdir (
- char *, /* path */
- int /* mode */
-);
-#endif
-
/*
* Some XTRANSDEBUG stuff
*/
diff --git a/transport.c b/transport.c
index 5131d99..baf5bfd 100644
--- a/transport.c
+++ b/transport.c
@@ -59,6 +59,7 @@ from The Open Group.
#endif
#include "Xtransint.h"
+#include "Xtransutil.c"
#ifdef LOCALCONN
#include "Xtranslcl.c"
@@ -70,4 +71,3 @@ from The Open Group.
#include "Xtranstli.c"
#endif
#include "Xtrans.c"
-#include "Xtransutil.c"