[PATCH] Revert "Fix "XXX declared 'static' but not defined""
Benjamin Close
Benjamin.Close at clearchain.com
Sun Feb 8 22:03:59 PST 2009
This reverts commit d192bac409fe5ef99fa9fb9b5a0d5f656f0f1412.
When transport.c is directly include (as in the case of libICE:icetrans.c:32)
Xtranssock.c must be included before Xtransutil.c in order for the socket
structures to be included. Including Xtransutil.c after Xtranssock.c requires
is_number and trans_mkdir to be defined.
This reintroduces the warning until a cleaner solution can be found
but fixes the build.
Found by: Tinderbox
Signed-off-by: Benjamin Close <Benjamin.Close at clearchain.com>
---
Xtransint.h | 12 ++++++++++++
transport.c | 2 +-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/Xtransint.h b/Xtransint.h
index e1a95a2..623cdef 100644
--- a/Xtransint.h
+++ b/Xtransint.h
@@ -345,6 +345,18 @@ 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 baf5bfd..5131d99 100644
--- a/transport.c
+++ b/transport.c
@@ -59,7 +59,6 @@ from The Open Group.
#endif
#include "Xtransint.h"
-#include "Xtransutil.c"
#ifdef LOCALCONN
#include "Xtranslcl.c"
@@ -71,3 +70,4 @@ from The Open Group.
#include "Xtranstli.c"
#endif
#include "Xtrans.c"
+#include "Xtransutil.c"
--
1.6.0.6
More information about the xorg
mailing list