- Add os.h and misc.h to proto/X11

- In symlink.sh move os.h and misc.h from xserver/include to proto/X11
- in xc/lib/lbxutil/ do some include-with-<>-instead-of-with-""

8 files changed, 15 insertions, 15 deletions

diff --git a/src/delta/lbxdelta.c b/src/delta/lbxdelta.c
index 7066a9c..62b3f84 100644
--- a/src/delta/lbxdelta.c
+++ b/src/delta/lbxdelta.c
@@ -24,12 +24,12 @@
  */
 /* $XFree86: xc/lib/lbxutil/delta/lbxdelta.c,v 1.7 2001/07/25 15:04:57 dawes Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
-#include "os.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/os.h>
 #define _XLBX_SERVER_
-#include "lbxstr.h"
-#include "lbxdeltastr.h"
+#include <X11/extensions/lbxstr.h>
+#include <X11/extensions/lbxdeltastr.h>
 
 #include <stddef.h>
 
diff --git a/src/image/dfaxg42d.c b/src/image/dfaxg42d.c
index ec4c8a3..609992d 100644
--- a/src/image/dfaxg42d.c
+++ b/src/image/dfaxg42d.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include "g3states.h"
 #include "lbxfax.h"
-#include "lbximage.h"
+#include <X11/extensions/lbximage.h>
 
 /*
  * -------------------------------------------------------------------------
diff --git a/src/image/dpackbits.c b/src/image/dpackbits.c
index bb5f12a..f0f2058 100644
--- a/src/image/dpackbits.c
+++ b/src/image/dpackbits.c
@@ -26,7 +26,7 @@
 
 #include <X11/Xos.h>
 #include <X11/Xfuncproto.h>
-#include "lbximage.h"
+#include <X11/extensions/lbximage.h>
 
 /*
  * -------------------------------------------------------------------------
diff --git a/src/image/efaxg42d.c b/src/image/efaxg42d.c
index 83dcf4f..a89b5e0 100644
--- a/src/image/efaxg42d.c
+++ b/src/image/efaxg42d.c
@@ -28,7 +28,7 @@
 #include <X11/Xfuncproto.h>
 #include <stdlib.h>
 #include "lbxfax.h"
-#include "lbximage.h"
+#include <X11/extensions/lbximage.h>
 #include "lbxbwcodes.h"
 
 /*
diff --git a/src/image/epackbits.c b/src/image/epackbits.c
index 7e15c2b..816fee5 100644
--- a/src/image/epackbits.c
+++ b/src/image/epackbits.c
@@ -24,7 +24,7 @@
  */
 
 #include <X11/Xfuncproto.h>
-#include "lbximage.h"
+#include <X11/extensions/lbximage.h>
 
 /*
  * -------------------------------------------------------------------------
diff --git a/src/lbx_zlib/lbx_zlib.c b/src/lbx_zlib/lbx_zlib.c
index 3ffb7e9..628bdba 100644
--- a/src/lbx_zlib/lbx_zlib.c
+++ b/src/lbx_zlib/lbx_zlib.c
@@ -63,10 +63,10 @@ from The Open Group.
 #if !defined(WIN32) && !defined(Lynx)
 #include <sys/param.h>
 #endif
-#include "lbxbufstr.h"
+#include <X11/extensions/lbxbufstr.h>
 #include "lbx_zlib.h"
-#include "os.h"
-#include "lbxzlib.h"
+#include <X11/os.h>
+#include <X11/extensions/lbxzlib.h>
 
 unsigned long stream_out_compressed;
 unsigned long stream_out_uncompressed;
diff --git a/src/lbx_zlib/lbx_zlib.h b/src/lbx_zlib/lbx_zlib.h
index 22e901a..8c4f195 100644
--- a/src/lbx_zlib/lbx_zlib.h
+++ b/src/lbx_zlib/lbx_zlib.h
@@ -53,7 +53,7 @@ from The Open Group.
 /* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h,v 1.9 2001/08/27 19:01:07 dawes Exp $ */
 
 #include "zlib.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 
 struct compress_private {
     z_stream	stream;
diff --git a/src/lbx_zlib/lbx_zlib_io.c b/src/lbx_zlib/lbx_zlib_io.c
index 89b095d..20a8bff 100644
--- a/src/lbx_zlib/lbx_zlib_io.c
+++ b/src/lbx_zlib/lbx_zlib_io.c
@@ -33,9 +33,9 @@
 #if !defined(WIN32) && !defined(Lynx)
 #include <sys/param.h>
 #endif
-#include "lbxbufstr.h"
+#include <X11/extensions/lbxbufstr.h>
 #include "lbx_zlib.h"
-#include "os.h"
+#include <X11/os.h>
 
 #include <stddef.h>