[PD-cvs] pd/src config.h.in, 1.1.8.1, 1.1.8.2 configure.in, 1.21.2.1.4.3, 1.21.2.1.4.4 d_soundfile.c, 1.12.6.3, 1.12.6.4 g_all_guis.c, 1.9.6.2, 1.9.6.3 g_bang.c, 1.5.6.2, 1.5.6.3 g_hdial.c, 1.7.6.2, 1.7.6.3 g_hslider.c, 1.6.6.2, 1.6.6.3 g_mycanvas.c, 1.5.20.2, 1.5.20.3 g_numbox.c, 1.8.6.2, 1.8.6.3 g_toggle.c, 1.5.6.2, 1.5.6.3 g_vslider.c, 1.6.6.2, 1.6.6.3 g_vumeter.c, 1.5.10.2, 1.5.10.3 m_binbuf.c, 1.13.6.3, 1.13.6.4 m_class.c, 1.7.6.3, 1.7.6.4 s_file.c, 1.9.6.2, 1.9.6.3 s_inter.c, 1.18.2.1.2.2, 1.18.2.1.2.3 s_loader.c, 1.13.2.1.4.2, 1.13.2.1.4.3 s_main.c, 1.28.6.4, 1.28.6.5 s_path.c, 1.11.6.1, 1.11.6.2 t_tkcmd.c, 1.7.6.1, 1.7.6.2 x_qlist.c, 1.3.6.1, 1.3.6.2

Russell Bryant russellbryant at users.sourceforge.net
Sun Jan 6 04:43:11 CET 2008 

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6377

Modified Files:
      Tag: branch-v0-40-extended
	config.h.in configure.in d_soundfile.c g_all_guis.c g_bang.c 
	g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c g_toggle.c 
	g_vslider.c g_vumeter.c m_binbuf.c m_class.c s_file.c 
	s_inter.c s_loader.c s_main.c s_path.c t_tkcmd.c x_qlist.c 
Log Message:
 - Have the configure script check for the presence of io.h.
 - Instead of using MSW to conditionally include io.h, use the result from
   the configure script.


Index: s_loader.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v
retrieving revision 1.13.2.1.4.2
retrieving revision 1.13.2.1.4.3
diff -C2 -d -r1.13.2.1.4.2 -r1.13.2.1.4.3
*** s_loader.c	6 Jan 2008 03:27:53 -0000	1.13.2.1.4.2
--- s_loader.c	6 Jan 2008 03:43:08 -0000	1.13.2.1.4.3
***************
*** 17,22 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #include <windows.h>
  #endif
--- 17,25 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
+ #endif
+ 
+ #ifdef MSW
  #include <windows.h>
  #endif

Index: m_binbuf.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_binbuf.c,v
retrieving revision 1.13.6.3
retrieving revision 1.13.6.4
diff -C2 -d -r1.13.6.3 -r1.13.6.4
*** m_binbuf.c	6 Jan 2008 03:27:53 -0000	1.13.6.3
--- m_binbuf.c	6 Jan 2008 03:43:08 -0000	1.13.6.4
***************
*** 9,18 ****
  #include "s_stuff.h"
  #include <stdio.h>
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
! #ifdef MSW
  #include <io.h>
  #endif
  #include <fcntl.h>
  #include <string.h>
--- 9,21 ----
  #include "s_stuff.h"
  #include <stdio.h>
+ 
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
! 
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif
+ 
  #include <fcntl.h>
  #include <string.h>

Index: g_all_guis.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v
retrieving revision 1.9.6.2
retrieving revision 1.9.6.3
diff -C2 -d -r1.9.6.2 -r1.9.6.3
*** g_all_guis.c	6 Jan 2008 03:27:53 -0000	1.9.6.2
--- g_all_guis.c	6 Jan 2008 03:43:08 -0000	1.9.6.3
***************
*** 22,26 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #endif
--- 22,26 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif

Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.28.6.4
retrieving revision 1.28.6.5
diff -C2 -d -r1.28.6.4 -r1.28.6.5
*** s_main.c	6 Jan 2008 03:27:53 -0000	1.28.6.4
--- s_main.c	6 Jan 2008 03:43:08 -0000	1.28.6.5
***************
*** 20,25 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #include <windows.h>
  #include <winbase.h>
--- 20,28 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
+ #endif
+ 
+ #ifdef MSW
  #include <windows.h>
  #include <winbase.h>

Index: s_file.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_file.c,v
retrieving revision 1.9.6.2
retrieving revision 1.9.6.3
diff -C2 -d -r1.9.6.2 -r1.9.6.3
*** s_file.c	6 Jan 2008 03:27:53 -0000	1.9.6.2
--- s_file.c	6 Jan 2008 03:43:08 -0000	1.9.6.3
***************
*** 21,25 ****
  
  #ifdef HAVE_UNISTD_H
! #include <alloca.h>
  #endif
  
--- 21,25 ----
  
  #ifdef HAVE_UNISTD_H
! #include <unistd.h>
  #endif
  

Index: s_path.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_path.c,v
retrieving revision 1.11.6.1
retrieving revision 1.11.6.2
diff -C2 -d -r1.11.6.1 -r1.11.6.2
*** s_path.c	6 Jan 2008 03:27:53 -0000	1.11.6.1
--- s_path.c	6 Jan 2008 03:43:08 -0000	1.11.6.2
***************
*** 27,31 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #endif
--- 27,31 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif

Index: g_toggle.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v
retrieving revision 1.5.6.2
retrieving revision 1.5.6.3
diff -C2 -d -r1.5.6.2 -r1.5.6.3
*** g_toggle.c	6 Jan 2008 03:27:53 -0000	1.5.6.2
--- g_toggle.c	6 Jan 2008 03:43:08 -0000	1.5.6.3
***************
*** 22,26 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #endif
--- 22,26 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif

Index: s_inter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
retrieving revision 1.18.2.1.2.2
retrieving revision 1.18.2.1.2.3
diff -C2 -d -r1.18.2.1.2.2 -r1.18.2.1.2.3
*** s_inter.c	6 Jan 2008 03:27:53 -0000	1.18.2.1.2.2
--- s_inter.c	6 Jan 2008 03:43:08 -0000	1.18.2.1.2.3
***************
*** 27,35 ****
  #include <sys/resource.h>
  #endif
  #ifdef HAVE_BSTRING_H
  #include <bstring.h>
  #endif
! #ifdef _WIN32
  #include <io.h>
  #include <fcntl.h>
  #include <process.h>
--- 27,40 ----
  #include <sys/resource.h>
  #endif
+ 
  #ifdef HAVE_BSTRING_H
  #include <bstring.h>
  #endif
! 
! #ifdef HAVE_IO_H
  #include <io.h>
+ #endif
+ 
+ #ifdef _WIN32
  #include <fcntl.h>
  #include <process.h>

Index: g_mycanvas.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v
retrieving revision 1.5.20.2
retrieving revision 1.5.20.3
diff -C2 -d -r1.5.20.2 -r1.5.20.3
*** g_mycanvas.c	6 Jan 2008 03:27:53 -0000	1.5.20.2
--- g_mycanvas.c	6 Jan 2008 03:43:08 -0000	1.5.20.3
***************
*** 22,26 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #endif
--- 22,26 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif

Index: x_qlist.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/x_qlist.c,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -C2 -d -r1.3.6.1 -r1.3.6.2
*** x_qlist.c	6 Jan 2008 03:27:53 -0000	1.3.6.1
--- x_qlist.c	6 Jan 2008 03:43:08 -0000	1.3.6.2
***************
*** 12,16 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #endif
--- 12,16 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif

Index: g_hdial.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v
retrieving revision 1.7.6.2
retrieving revision 1.7.6.3
diff -C2 -d -r1.7.6.2 -r1.7.6.3
*** g_hdial.c	6 Jan 2008 03:27:53 -0000	1.7.6.2
--- g_hdial.c	6 Jan 2008 03:43:08 -0000	1.7.6.3
***************
*** 25,29 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #endif
--- 25,29 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif

Index: d_soundfile.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v
retrieving revision 1.12.6.3
retrieving revision 1.12.6.4
diff -C2 -d -r1.12.6.3 -r1.12.6.4
*** d_soundfile.c	6 Jan 2008 03:27:52 -0000	1.12.6.3
--- d_soundfile.c	6 Jan 2008 03:43:08 -0000	1.12.6.4
***************
*** 22,28 ****
  #endif
  #include <pthread.h>
! #ifdef MSW
  #include <io.h>
  #endif
  #include <stdio.h>
  #include <string.h>
--- 22,30 ----
  #endif
  #include <pthread.h>
! 
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif
+ 
  #include <stdio.h>
  #include <string.h>

Index: m_class.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_class.c,v
retrieving revision 1.7.6.3
retrieving revision 1.7.6.4
diff -C2 -d -r1.7.6.3 -r1.7.6.4
*** m_class.c	6 Jan 2008 03:27:53 -0000	1.7.6.3
--- m_class.c	6 Jan 2008 03:43:08 -0000	1.7.6.4
***************
*** 10,17 ****
  #include "s_stuff.h"
  #include <stdlib.h>
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
! #ifdef MSW
  #include <io.h>
  #endif
--- 10,19 ----
  #include "s_stuff.h"
  #include <stdlib.h>
+ 
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
! 
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif

Index: g_vslider.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_vslider.c,v
retrieving revision 1.6.6.2
retrieving revision 1.6.6.3
diff -C2 -d -r1.6.6.2 -r1.6.6.3
*** g_vslider.c	6 Jan 2008 03:27:53 -0000	1.6.6.2
--- g_vslider.c	6 Jan 2008 03:43:08 -0000	1.6.6.3
***************
*** 22,26 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #endif
--- 22,26 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif

Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.21.2.1.4.3
retrieving revision 1.21.2.1.4.4
diff -C2 -d -r1.21.2.1.4.3 -r1.21.2.1.4.4
*** configure.in	6 Jan 2008 03:27:52 -0000	1.21.2.1.4.3
--- configure.in	6 Jan 2008 03:43:08 -0000	1.21.2.1.4.4
***************
*** 62,66 ****
  dnl Checks for header files.
  AC_HEADER_STDC
! AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/ioctl.h sys/time.h unistd.h bstring.h)
  
  dnl Checks for library functions.
--- 62,66 ----
  dnl Checks for header files.
  AC_HEADER_STDC
! AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/ioctl.h sys/time.h unistd.h bstring.h io.h)
  
  dnl Checks for library functions.

Index: g_vumeter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v
retrieving revision 1.5.10.2
retrieving revision 1.5.10.3
diff -C2 -d -r1.5.10.2 -r1.5.10.3
*** g_vumeter.c	6 Jan 2008 03:27:53 -0000	1.5.10.2
--- g_vumeter.c	6 Jan 2008 03:43:08 -0000	1.5.10.3
***************
*** 22,26 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #endif
--- 22,26 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif

Index: t_tkcmd.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/t_tkcmd.c,v
retrieving revision 1.7.6.1
retrieving revision 1.7.6.2
diff -C2 -d -r1.7.6.1 -r1.7.6.2
*** t_tkcmd.c	6 Jan 2008 03:27:53 -0000	1.7.6.1
--- t_tkcmd.c	6 Jan 2008 03:43:08 -0000	1.7.6.2
***************
*** 32,38 ****
  #include <fcntl.h>
  #endif
  #ifdef MSW
  #include <winsock.h>
- #include <io.h>
  #endif
  
--- 32,42 ----
  #include <fcntl.h>
  #endif
+ 
+ #ifdef HAVE_IO_H
+ #include <io.h>
+ #endif
+ 
  #ifdef MSW
  #include <winsock.h>
  #endif
  

Index: g_hslider.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v
retrieving revision 1.6.6.2
retrieving revision 1.6.6.3
diff -C2 -d -r1.6.6.2 -r1.6.6.3
*** g_hslider.c	6 Jan 2008 03:27:53 -0000	1.6.6.2
--- g_hslider.c	6 Jan 2008 03:43:08 -0000	1.6.6.3
***************
*** 22,26 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #endif
--- 22,26 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif

Index: g_bang.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v
retrieving revision 1.5.6.2
retrieving revision 1.5.6.3
diff -C2 -d -r1.5.6.2 -r1.5.6.3
*** g_bang.c	6 Jan 2008 03:27:53 -0000	1.5.6.2
--- g_bang.c	6 Jan 2008 03:43:08 -0000	1.5.6.3
***************
*** 22,26 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #endif
--- 22,26 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif

Index: g_numbox.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v
retrieving revision 1.8.6.2
retrieving revision 1.8.6.3
diff -C2 -d -r1.8.6.2 -r1.8.6.3
*** g_numbox.c	6 Jan 2008 03:27:53 -0000	1.8.6.2
--- g_numbox.c	6 Jan 2008 03:43:08 -0000	1.8.6.3
***************
*** 21,25 ****
  #endif
  
! #ifdef MSW
  #include <io.h>
  #endif
--- 21,25 ----
  #endif
  
! #ifdef HAVE_IO_H
  #include <io.h>
  #endif

Index: config.h.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/config.h.in,v
retrieving revision 1.1.8.1
retrieving revision 1.1.8.2
diff -C2 -d -r1.1.8.1 -r1.1.8.2
*** config.h.in	2 Jan 2008 17:20:38 -0000	1.1.8.1
--- config.h.in	6 Jan 2008 03:43:08 -0000	1.1.8.2
***************
*** 61,64 ****
--- 61,67 ----
  #undef HAVE_INTTYPES_H
  
+ /* Define to 1 if you have the <io.h> header file. */
+ #undef HAVE_IO_H
+ 
  /* Define to 1 if you have the `tcl84' library (-ltcl84). */
  #undef HAVE_LIBTCL84

More information about the Pd-cvs mailing list