Sun Jan 6 04:27:55 CET 2008

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

Modified Files:
      Tag: branch-v0-40-extended
	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 m_sched.c s_audio.c s_file.c 
	s_inter.c s_loader.c s_main.c s_midi.c s_midi_alsa.c 
	s_midi_oss.c s_midi_pm.c s_midi_sgi.c s_path.c t_tkcmd.c 
	u_pdreceive.c u_pdsend.c x_gui.c x_misc.c x_qlist.c 
Log Message:
- Remove the hardcoded -DUNISTD from the CFLAGS that were there for Linux and
  Darwin in favor of using HAVE_UNISTD_H, which is the result of checking for
  <unistd.h> done by the configure script.
- Make usage of HAVE_UNISTD_H in a bunch of places instead of using UNISTD or
  !MSW.
- Mark a few places with XXX where other headers were being included based on
  UNISTD, where a cleaner check should be implemented, instead.

Index: m_binbuf.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_binbuf.c,v
retrieving revision 1.13.6.2
retrieving revision 1.13.6.3
diff -C2 -d -r1.13.6.2 -r1.13.6.3
*** m_binbuf.c	25 Nov 2007 03:31:05 -0000	1.13.6.2
--- m_binbuf.c	6 Jan 2008 03:27:53 -0000	1.13.6.3
***************
*** 3,6 ****
--- 3,7 ----
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */

+ #include "config.h"

  #include <stdlib.h>
***************
*** 8,12 ****
  #include "s_stuff.h"
  #include <stdio.h>
! #ifdef UNISTD
  #include <unistd.h>
  #endif
--- 9,13 ----
  #include "s_stuff.h"
  #include <stdio.h>
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif

Index: x_qlist.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/x_qlist.c,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** x_qlist.c	9 Oct 2006 04:36:12 -0000	1.3
--- x_qlist.c	6 Jan 2008 03:27:53 -0000	1.3.6.1
***************
*** 3,11 ****
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */

  #include "m_pd.h"
  #include <string.h>
! #ifdef UNISTD
  #include <unistd.h>
  #endif
  #ifdef MSW
  #include <io.h>
--- 3,15 ----
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */

+ #include "config.h"
+ 
  #include "m_pd.h"
  #include <string.h>
! 
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
+ 
  #ifdef MSW
  #include <io.h>

Index: s_path.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_path.c,v
retrieving revision 1.11
retrieving revision 1.11.6.1
diff -C2 -d -r1.11 -r1.11.6.1
*** s_path.c	8 Sep 2006 23:45:31 -0000	1.11
--- s_path.c	6 Jan 2008 03:27:53 -0000	1.11.6.1
***************
*** 11,22 ****
   */ 

  /* #define DEBUG(x) x */
  #define DEBUG(x)

  #include <stdlib.h>
! #ifdef UNISTD
  #include <unistd.h>
  #include <sys/stat.h>
  #endif
  #ifdef MSW
  #include <io.h>
--- 11,30 ----
   */ 

+ #include "config.h"
+ 
  /* #define DEBUG(x) x */
  #define DEBUG(x)

  #include <stdlib.h>
! 
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
+ #endif
+ 
+ #ifdef HAVE_UNISTD_H
+ /*! XXX Hack! */
  #include <sys/stat.h>
  #endif
+ 
  #ifdef MSW
  #include <io.h>
***************
*** 196,200 ****
      {
              /* in unix, further check that it's not a directory */
! #ifdef UNISTD
          struct stat statbuf;
          int ok =  ((fstat(fd, &statbuf) >= 0) &&
--- 204,208 ----
      {
              /* in unix, further check that it's not a directory */
! #ifdef HAVE_UNISTD_H
          struct stat statbuf;
          int ok =  ((fstat(fd, &statbuf) >= 0) &&

Index: g_toggle.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v
retrieving revision 1.5.6.1
retrieving revision 1.5.6.2
diff -C2 -d -r1.5.6.1 -r1.5.6.2
*** g_toggle.c	4 Nov 2007 18:00:20 -0000	1.5.6.1
--- g_toggle.c	6 Jan 2008 03:27:53 -0000	1.5.6.2
***************
*** 6,9 ****
--- 6,10 ----
  /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */

+ #include "config.h"

  #include <stdlib.h>
***************
*** 17,24 ****
  #include <math.h>

  #ifdef MSW
  #include <io.h>
- #else
- #include <unistd.h>
  #endif

--- 18,27 ----
  #include <math.h>

+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
  #ifdef MSW
  #include <io.h>
  #endif

Index: s_midi_pm.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_midi_pm.c,v
retrieving revision 1.6
retrieving revision 1.6.10.1
diff -C2 -d -r1.6 -r1.6.10.1
*** s_midi_pm.c	8 Jul 2005 00:02:45 -0000	1.6
--- s_midi_pm.c	6 Jan 2008 03:27:53 -0000	1.6.10.1
***************
*** 8,15 ****
  */

  #include "m_pd.h"
  #include "s_stuff.h"
  #include <stdio.h>
! #ifdef UNISTD
  #include <unistd.h>
  #include <sys/time.h>
--- 8,17 ----
  */

+ #include "config.h"
+ 
  #include "m_pd.h"
  #include "s_stuff.h"
  #include <stdio.h>
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #include <sys/time.h>

Index: m_class.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_class.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
*** m_class.c	25 Nov 2007 03:31:05 -0000	1.7.6.2
--- m_class.c	6 Jan 2008 03:27:53 -0000	1.7.6.3
***************
*** 3,6 ****
--- 3,8 ----
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */

+ #include "config.h"
+ 
  #define PD_CLASS_DEF
  #include "m_pd.h"
***************
*** 8,12 ****
  #include "s_stuff.h"
  #include <stdlib.h>
! #ifdef UNISTD
  #include <unistd.h>
  #endif
--- 10,14 ----
  #include "s_stuff.h"
  #include <stdlib.h>
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif

Index: g_vslider.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_vslider.c,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -C2 -d -r1.6.6.1 -r1.6.6.2
*** g_vslider.c	4 Nov 2007 18:00:20 -0000	1.6.6.1
--- g_vslider.c	6 Jan 2008 03:27:53 -0000	1.6.6.2
***************
*** 6,9 ****
--- 6,10 ----
  /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */

+ #include "config.h"

  #include <stdlib.h>
***************
*** 17,24 ****
  #include <math.h>

  #ifdef MSW
  #include <io.h>
- #else
- #include <unistd.h>
  #endif

--- 18,27 ----
  #include <math.h>

+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
  #ifdef MSW
  #include <io.h>
  #endif

Index: g_vumeter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v
retrieving revision 1.5.10.1
retrieving revision 1.5.10.2
diff -C2 -d -r1.5.10.1 -r1.5.10.2
*** g_vumeter.c	4 Nov 2007 18:00:20 -0000	1.5.10.1
--- g_vumeter.c	6 Jan 2008 03:27:53 -0000	1.5.10.2
***************
*** 6,9 ****
--- 6,10 ----
  /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */

+ #include "config.h"

  #include <stdlib.h>
***************
*** 17,24 ****
  #include <math.h>

  #ifdef MSW
  #include <io.h>
- #else
- #include <unistd.h>
  #endif

--- 18,27 ----
  #include <math.h>

+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
  #ifdef MSW
  #include <io.h>
  #endif

Index: x_gui.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/x_gui.c,v
retrieving revision 1.5.6.1
retrieving revision 1.5.6.2
diff -C2 -d -r1.5.6.1 -r1.5.6.2
*** x_gui.c	6 Jan 2008 02:43:59 -0000	1.5.6.1
--- x_gui.c	6 Jan 2008 03:27:53 -0000	1.5.6.2
***************
*** 6,13 ****
  away before the panel does... */

  #include "m_pd.h"
  #include <stdio.h>
  #include <string.h>
! #ifdef UNISTD
  #include <unistd.h>
  #endif
--- 6,16 ----
  away before the panel does... */

+ #include "config.h"
+ 
  #include "m_pd.h"
  #include <stdio.h>
  #include <string.h>
! 
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif

Index: g_hdial.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_hdial.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
*** g_hdial.c	4 Nov 2007 18:00:20 -0000	1.7.6.1
--- g_hdial.c	6 Jan 2008 03:27:53 -0000	1.7.6.2
***************
*** 9,12 ****
--- 9,14 ----
  put out a "float" as in sliders, toggles, etc. */

+ #include "config.h"
+ 
  #include <stdlib.h>
  #include <string.h>
***************
*** 19,26 ****
  #include <math.h>

  #ifdef MSW
  #include <io.h>
- #else
- #include <unistd.h>
  #endif

--- 21,30 ----
  #include <math.h>

+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
  #ifdef MSW
  #include <io.h>
  #endif

Index: g_all_guis.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v
retrieving revision 1.9.6.1
retrieving revision 1.9.6.2
diff -C2 -d -r1.9.6.1 -r1.9.6.2
*** g_all_guis.c	4 Nov 2007 18:00:20 -0000	1.9.6.1
--- g_all_guis.c	6 Jan 2008 03:27:53 -0000	1.9.6.2
***************
*** 6,9 ****
--- 6,10 ----
  /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */

+ #include "config.h"

  #include <stdlib.h>
***************
*** 17,24 ****
  #include <math.h>

  #ifdef MSW
  #include <io.h>
- #else
- #include <unistd.h>
  #endif

--- 18,27 ----
  #include <math.h>

+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
  #ifdef MSW
  #include <io.h>
  #endif

Index: g_mycanvas.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v
retrieving revision 1.5.20.1
retrieving revision 1.5.20.2
diff -C2 -d -r1.5.20.1 -r1.5.20.2
*** g_mycanvas.c	4 Nov 2007 18:00:20 -0000	1.5.20.1
--- g_mycanvas.c	6 Jan 2008 03:27:53 -0000	1.5.20.2
***************
*** 6,9 ****
--- 6,10 ----
  /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */

+ #include "config.h"

  #include <stdlib.h>
***************
*** 17,24 ****
  #include <math.h>

  #ifdef MSW
  #include <io.h>
- #else
- #include <unistd.h>
  #endif

--- 18,27 ----
  #include <math.h>

+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
  #ifdef MSW
  #include <io.h>
  #endif

Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.21.2.1.4.2
retrieving revision 1.21.2.1.4.3
diff -C2 -d -r1.21.2.1.4.2 -r1.21.2.1.4.3
*** configure.in	2 Jan 2008 17:20:38 -0000	1.21.2.1.4.2
--- configure.in	6 Jan 2008 03:27:52 -0000	1.21.2.1.4.3
***************
*** 188,192 ****
      fi 
      EXT=pd_linux
!     CPPFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD\
      	-DUSEAPI_OSS \
          -I../portaudio/pa_common -I../portaudio/pablio \
--- 188,192 ----
      fi 
      EXT=pd_linux
!     CPPFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX\
      	-DUSEAPI_OSS \
          -I../portaudio/pa_common -I../portaudio/pablio \
***************
*** 261,265 ****
          -framework Carbon -framework CoreMIDI"
      EXT=pd_darwin
!     CPPFLAGS="-DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include \
  	-I../portaudio/pa_common -I../portaudio/pablio \
  	-I../portmidi/pm_common -I../portmidi/pm_mac \
--- 261,265 ----
          -framework Carbon -framework CoreMIDI"
      EXT=pd_darwin
!     CPPFLAGS="-DDL_OPEN -DMACOSX -I/usr/X11R6/include \
  	-I../portaudio/pa_common -I../portaudio/pablio \
  	-I../portmidi/pm_common -I../portmidi/pm_mac \

Index: d_soundfile.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v
retrieving revision 1.12.6.2
retrieving revision 1.12.6.3
diff -C2 -d -r1.12.6.2 -r1.12.6.3
*** d_soundfile.c	29 Nov 2007 18:24:38 -0000	1.12.6.2
--- d_soundfile.c	6 Jan 2008 03:27:52 -0000	1.12.6.3
***************
*** 12,17 ****
  objects use Posix-like threads.  */

! #ifndef MSW
  #include <unistd.h>
  #include <fcntl.h>
  #endif
--- 12,22 ----
  objects use Posix-like threads.  */

! #include "config.h"
! 
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
+ #endif
+ 
+ #ifndef MSW
  #include <fcntl.h>
  #endif

Index: g_hslider.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -C2 -d -r1.6.6.1 -r1.6.6.2
*** g_hslider.c	4 Nov 2007 18:00:20 -0000	1.6.6.1
--- g_hslider.c	6 Jan 2008 03:27:53 -0000	1.6.6.2
***************
*** 6,9 ****
--- 6,10 ----
  /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */

+ #include "config.h"

  #include <stdlib.h>
***************
*** 17,24 ****
  #include <math.h>

  #ifdef MSW
  #include <io.h>
- #else
- #include <unistd.h>
  #endif

--- 18,27 ----
  #include <math.h>

+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
  #ifdef MSW
  #include <io.h>
  #endif

Index: s_audio.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v
retrieving revision 1.12
retrieving revision 1.12.6.1
diff -C2 -d -r1.12 -r1.12.6.1
*** s_audio.c	4 Oct 2006 19:35:06 -0000	1.12
--- s_audio.c	6 Jan 2008 03:27:53 -0000	1.12.6.1
***************
*** 7,15 ****
  */

  #include "m_pd.h"
  #include "s_stuff.h"
  #include <stdio.h>
! #ifdef UNISTD
  #include <unistd.h>
  #include <sys/time.h>
  #include <sys/resource.h>
--- 7,18 ----
  */

+ #include "config.h"
+ 
  #include "m_pd.h"
  #include "s_stuff.h"
  #include <stdio.h>
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
+ /* XXX Hack!!! These should be checked for independently of unistd.h ... */
  #include <sys/time.h>
  #include <sys/resource.h>

Index: s_loader.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v
retrieving revision 1.13.2.1.4.1
retrieving revision 1.13.2.1.4.2
diff -C2 -d -r1.13.2.1.4.1 -r1.13.2.1.4.2
*** s_loader.c	4 Nov 2007 18:00:20 -0000	1.13.2.1.4.1
--- s_loader.c	6 Jan 2008 03:27:53 -0000	1.13.2.1.4.2
***************
*** 3,13 ****
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */

  #ifdef DL_OPEN
  #include <dlfcn.h>
  #endif
! #ifdef UNISTD
! #include <stdlib.h>
  #include <unistd.h>
  #endif
  #ifdef MSW
  #include <io.h>
--- 3,20 ----
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */

+ #include "config.h"
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ 
  #ifdef DL_OPEN
  #include <dlfcn.h>
  #endif
! 
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
+ 
  #ifdef MSW
  #include <io.h>
***************
*** 17,24 ****
  #include <mach-o/dyld.h> 
  #endif
- #include <string.h>
  #include "m_pd.h"
  #include "s_stuff.h"
- #include <stdio.h>

  typedef void (*t_xxx)(void);
--- 24,29 ----

Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.28.6.3
retrieving revision 1.28.6.4
diff -C2 -d -r1.28.6.3 -r1.28.6.4
*** s_main.c	26 Dec 2007 21:45:02 -0000	1.28.6.3
--- s_main.c	6 Jan 2008 03:27:53 -0000	1.28.6.4
***************
*** 3,6 ****
--- 3,8 ----
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */

+ #include "config.h"
+ 
  #include "m_pd.h"
  #include "m_imp.h"
***************
*** 14,20 ****
  #include <stdlib.h>

! #ifdef UNISTD
  #include <unistd.h>
  #endif
  #ifdef MSW
  #include <io.h>
--- 16,23 ----
  #include <stdlib.h>

! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
+ 
  #ifdef MSW
  #include <io.h>
***************
*** 391,395 ****
  "-send \"msg...\"   -- send a message at startup, after patches are loaded\n",
  "-noprefs         -- suppress loading preferences on startup\n",
! #ifdef UNISTD
  "-rt or -realtime -- use real-time priority\n",
  "-nrt             -- don't use real-time priority\n",
--- 394,398 ----
  "-send \"msg...\"   -- send a message at startup, after patches are loaded\n",
  "-noprefs         -- suppress loading preferences on startup\n",
! #ifdef HAVE_UNISTD_H
  "-rt or -realtime -- use real-time priority\n",
  "-nrt             -- don't use real-time priority\n",
***************
*** 436,440 ****
      char sbuf[MAXPDSTRING], sbuf2[MAXPDSTRING], *sp;
      char *lastslash; 
! #ifdef UNISTD
      struct stat statbuf;
  #endif
--- 439,443 ----
      char sbuf[MAXPDSTRING], sbuf2[MAXPDSTRING], *sp;
      char *lastslash; 
! #ifdef HAVE_UNISTD_H
      struct stat statbuf;
  #endif
***************
*** 446,450 ****
      sys_unbashfilename(sbuf2, sbuf);
  #endif /* MSW */
! #ifdef UNISTD
      strncpy(sbuf, progname, MAXPDSTRING);
      sbuf[MAXPDSTRING-1] = 0;
--- 449,453 ----
      sys_unbashfilename(sbuf2, sbuf);
  #endif /* MSW */
! #ifdef HAVE_UNISTD_H
      strncpy(sbuf, progname, MAXPDSTRING);
      sbuf[MAXPDSTRING-1] = 0;
***************
*** 819,823 ****
              argc -= 2;
          }
! #ifdef UNISTD
          else if (!strcmp(*argv, "-rt") || !strcmp(*argv, "-realtime"))
          {
--- 822,826 ----
              argc -= 2;
          }
! #ifdef HAVE_UNISTD_H
          else if (!strcmp(*argv, "-rt") || !strcmp(*argv, "-realtime"))
          {

Index: m_sched.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v
retrieving revision 1.8
retrieving revision 1.8.10.1
diff -C2 -d -r1.8 -r1.8.10.1
*** m_sched.c	18 May 2005 04:28:51 -0000	1.8
--- m_sched.c	6 Jan 2008 03:27:53 -0000	1.8.10.1
***************
*** 5,8 ****
--- 5,10 ----
  /*  scheduling stuff  */

+ #include "config.h"
+ 
  #include "m_pd.h"
  #include "m_imp.h"
***************
*** 37,41 ****
  t_clock *clock_setlist;

! #ifdef UNISTD
  #include <unistd.h>
  #endif
--- 39,43 ----
  t_clock *clock_setlist;

! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif

Index: s_midi.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_midi.c,v
retrieving revision 1.10
retrieving revision 1.10.6.1
diff -C2 -d -r1.10 -r1.10.6.1
*** s_midi.c	4 Oct 2006 19:35:06 -0000	1.10
--- s_midi.c	6 Jan 2008 03:27:53 -0000	1.10.6.1
***************
*** 5,18 ****
  /* Clock functions (which should move, but where?) and MIDI queueing */

  #include "m_pd.h"
  #include "s_stuff.h"
  #include "m_imp.h"
! #ifdef UNISTD
  #include <unistd.h>
  #include <sys/time.h>
  #ifdef HAVE_BSTRING_H
  #include <bstring.h>
  #endif
! #endif
  #ifdef MSW
  #include <winsock.h>
--- 5,27 ----
  /* Clock functions (which should move, but where?) and MIDI queueing */

+ #include "config.h"
+ 
  #include "m_pd.h"
  #include "s_stuff.h"
  #include "m_imp.h"
! 
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
+ #endif
+ 
+ #ifdef HAVE_UNISTD_H
+ /* XXX Hack!  This should be done with a cleaner check. */
  #include <sys/time.h>
+ #endif
+ 
  #ifdef HAVE_BSTRING_H
  #include <bstring.h>
  #endif
! 
  #ifdef MSW
  #include <winsock.h>

Index: s_midi_sgi.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/s_midi_sgi.c,v
retrieving revision 1.2
retrieving revision 1.2.20.1
diff -C2 -d -r1.2 -r1.2.20.1
*** s_midi_sgi.c	6 Sep 2004 20:20:36 -0000	1.2
--- s_midi_sgi.c	6 Jan 2008 03:27:53 -0000	1.2.20.1
***************
*** 3,15 ****
--- 3,23 ----
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */

+ #include "config.h"
+ 
  #include "m_pd.h"
  #include "s_stuff.h"
  #include <stdio.h>
  #include <stdlib.h>
+ 
+ #ifdef HAVE_UNISTD_H
  #include <unistd.h>
+ #endif
+ 
  #include <string.h>
+ 
  #ifdef HAVE_BSTRING_H
  #include <bstring.h>
  #endif
+ 
  #include <sys/types.h>
  #include <sys/time.h>

Index: s_midi_alsa.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_midi_alsa.c,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -C2 -d -r1.4 -r1.4.10.1
*** s_midi_alsa.c	19 Aug 2005 23:28:03 -0000	1.4
--- s_midi_alsa.c	6 Jan 2008 03:27:53 -0000	1.4.10.1
***************
*** 6,13 ****
  /* MIDI I/O for Linux using ALSA */

  #include <stdio.h>
! #ifdef UNISTD
  #include <unistd.h>
  #endif
  #include <stdlib.h>
  #include <sys/types.h>
--- 6,17 ----
  /* MIDI I/O for Linux using ALSA */

+ #include "config.h"
+ 
  #include <stdio.h>
! 
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
+ 
  #include <stdlib.h>
  #include <sys/types.h>

Index: s_midi_oss.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_midi_oss.c,v
retrieving revision 1.3
retrieving revision 1.3.18.1
diff -C2 -d -r1.3 -r1.3.18.1
*** s_midi_oss.c	6 Sep 2004 20:20:36 -0000	1.3
--- s_midi_oss.c	6 Jan 2008 03:27:53 -0000	1.3.18.1
***************
*** 6,11 ****
  /* MIDI I/O for Linux using OSS */

  #include <stdio.h>
! #ifdef UNISTD
  #include <unistd.h>
  #endif
--- 6,13 ----
  /* MIDI I/O for Linux using OSS */

+ #include "config.h"
+ 
  #include <stdio.h>
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif

Index: x_misc.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/x_misc.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_misc.c	4 Nov 2007 18:00:20 -0000	1.3.6.1
--- x_misc.c	6 Jan 2008 03:27:53 -0000	1.3.6.2
***************
*** 5,8 ****
--- 5,10 ----
  /* misc. */

+ #include "config.h"
+ 
  #include "m_pd.h"
  #include "s_stuff.h"
***************
*** 10,19 ****
  #include <stdio.h>
  #include <string.h>
! #ifdef UNISTD
  #include <sys/types.h>
  #include <sys/time.h>
  #include <sys/times.h>
  #include <sys/param.h>
- #include <unistd.h>
  #endif
  #ifdef MSW
--- 12,26 ----
  #include <stdio.h>
  #include <string.h>
! 
! #ifdef HAVE_UNISTD_H
! #include <unistd.h>
! #endif
! 
! #ifdef HAVE_UNISTD_H
! /* XXX Hack! */
  #include <sys/types.h>
  #include <sys/time.h>
  #include <sys/times.h>
  #include <sys/param.h>
  #endif
  #ifdef MSW
***************
*** 252,256 ****
  {
      t_object x_obj;
! #ifdef UNISTD
      struct tms x_setcputime;
  #endif
--- 259,263 ----
  {
      t_object x_obj;
! #ifdef HAVE_UNISTD_H
      struct tms x_setcputime;
  #endif
***************
*** 264,268 ****
  static void cputime_bang(t_cputime *x)
  {
! #ifdef UNISTD
      times(&x->x_setcputime);
  #endif
--- 271,275 ----
  static void cputime_bang(t_cputime *x)
  {
! #ifdef HAVE_UNISTD_H
      times(&x->x_setcputime);
  #endif
***************
*** 285,289 ****
  static void cputime_bang2(t_cputime *x)
  {
! #ifdef UNISTD
      float elapsedcpu;
      struct tms newcputime;
--- 292,296 ----
  static void cputime_bang2(t_cputime *x)
  {
! #ifdef HAVE_UNISTD_H
      float elapsedcpu;
      struct tms newcputime;

Index: u_pdreceive.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_pdreceive.c,v
retrieving revision 1.2
retrieving revision 1.2.18.1
diff -C2 -d -r1.2 -r1.2.18.1
*** u_pdreceive.c	6 Sep 2004 20:20:36 -0000	1.2
--- u_pdreceive.c	6 Jan 2008 03:27:53 -0000	1.2.18.1
***************
*** 7,10 ****
--- 7,12 ----
  standard output. */

+ #include "config.h"
+ 
  #include <sys/types.h>
  #include <string.h>
***************
*** 12,15 ****
--- 14,22 ----
  #include <errno.h>
  #include <stdlib.h>
+ 
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
  #ifdef MSW
  #include <winsock.h>
***************
*** 20,24 ****
  #include <netdb.h>
  #include <stdio.h>
- #include <unistd.h>
  #define SOCKET_ERROR -1
  #endif
--- 27,30 ----

Index: t_tkcmd.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/t_tkcmd.c,v
retrieving revision 1.7
retrieving revision 1.7.6.1
diff -C2 -d -r1.7 -r1.7.6.1
*** t_tkcmd.c	31 Dec 2005 20:55:25 -0000	1.7
--- t_tkcmd.c	6 Jan 2008 03:27:53 -0000	1.7.6.1
***************
*** 3,6 ****
--- 3,8 ----
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */

+ #include "config.h"
+ 
  #ifndef MSW     /* in unix this only works first; in MSW it only works last. */
  #include "tk.h"
***************
*** 14,19 ****
  #include <sys/types.h>

! #ifndef MSW
  #include <unistd.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
--- 16,24 ----
  #include <sys/types.h>

! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
+ #endif
+ 
+ #ifndef MSW
  #include <sys/socket.h>
  #include <netinet/in.h>
***************
*** 420,424 ****
  #endif

! #ifdef UNISTD
      childpid = fork();
      if (childpid < 0)
--- 425,429 ----
  #endif

! #ifdef HAVE_UNISTD_H
      childpid = fork();
      if (childpid < 0)
***************
*** 439,443 ****
          _exit(1);
      }
! #endif /* UNISTD */

  #ifdef MSW       
--- 444,448 ----
          _exit(1);
      }
! #endif /* HAVE_UNISTD_H */

  #ifdef MSW       

Index: s_file.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_file.c,v
retrieving revision 1.9.6.1
retrieving revision 1.9.6.2
diff -C2 -d -r1.9.6.1 -r1.9.6.2
*** s_file.c	4 Nov 2007 18:00:20 -0000	1.9.6.1
--- s_file.c	6 Jan 2008 03:27:53 -0000	1.9.6.2
***************
*** 11,14 ****
--- 11,16 ----
   */

+ #include "config.h"
+ 
  #include "m_pd.h"
  #include "s_stuff.h"
***************
*** 17,21 ****
  #include <stdio.h>
  #include <errno.h>
! #ifdef UNISTD
  #include <sys/types.h>
  #include <sys/stat.h>
--- 19,29 ----
  #include <stdio.h>
  #include <errno.h>
! 
! #ifdef HAVE_UNISTD_H
! #include <alloca.h>
! #endif
! 
! #ifdef HAVE_UNISTD_H
! /* XXX Hack!  This should be done with a cleaner check. */
  #include <sys/types.h>
  #include <sys/stat.h>
***************
*** 23,28 ****
  #include <sys/stat.h>
  #include <fcntl.h>
- #include <unistd.h>
  #endif
  #ifdef MSW
  #include <windows.h>
--- 31,36 ----
  #include <sys/stat.h>
  #include <fcntl.h>
  #endif
+ 
  #ifdef MSW
  #include <windows.h>

Index: s_inter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
retrieving revision 1.18.2.1.2.1
retrieving revision 1.18.2.1.2.2
diff -C2 -d -r1.18.2.1.2.1 -r1.18.2.1.2.2
*** s_inter.c	4 Nov 2007 18:00:20 -0000	1.18.2.1.2.1
--- s_inter.c	6 Jan 2008 03:27:53 -0000	1.18.2.1.2.2
***************
*** 6,15 ****
  that didn't really belong anywhere. */

  #include "m_pd.h"
  #include "s_stuff.h"
  #include "m_imp.h"
  #include "g_canvas.h"   /* for GUI queueing stuff */
! #ifndef MSW
  #include <unistd.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
--- 6,21 ----
  that didn't really belong anywhere. */

+ #include "config.h"
+ 
  #include "m_pd.h"
  #include "s_stuff.h"
  #include "m_imp.h"
  #include "g_canvas.h"   /* for GUI queueing stuff */
! 
! #ifdef HAVE_UNISTD_H
  #include <unistd.h>
+ #endif
+ 
+ #ifndef MSW
  #include <sys/socket.h>
  #include <netinet/in.h>
***************
*** 205,209 ****
  }

! #ifdef UNISTD
  typedef void (*sighandler_t)(int);

--- 211,215 ----
  }

! #ifdef HAVE_UNISTD_H
  typedef void (*sighandler_t)(int);

***************
*** 549,553 ****
  void sys_closesocket(int fd)
  {
! #ifdef UNISTD
      close(fd);
  #endif
--- 555,559 ----
  void sys_closesocket(int fd)
  {
! #ifdef HAVE_UNISTD_H
      close(fd);
  #endif
***************
*** 867,871 ****
      WSADATA nobby;
  #endif
! #ifdef UNISTD
      int stdinpipe[2];
  #endif
--- 873,877 ----
      WSADATA nobby;
  #endif
! #ifdef HAVE_UNISTD_H
      int stdinpipe[2];
  #endif
***************
*** 875,879 ****
      inbinbuf = binbuf_new();

! #ifdef UNISTD
      signal(SIGHUP, sys_huphandler);
      signal(SIGINT, sys_exithandler);
--- 881,885 ----
      inbinbuf = binbuf_new();

! #ifdef HAVE_UNISTD_H
      signal(SIGHUP, sys_huphandler);
      signal(SIGINT, sys_exithandler);
***************
*** 905,909 ****
              strcpy(cmdbuf, ".");
  #endif
! #ifdef UNISTD
          if (!getcwd(cmdbuf, MAXPDSTRING))
              strcpy(cmdbuf, ".");
--- 911,915 ----
              strcpy(cmdbuf, ".");
  #endif
! #ifdef HAVE_UNISTD_H
          if (!getcwd(cmdbuf, MAXPDSTRING))
              strcpy(cmdbuf, ".");
***************
*** 1014,1018 ****

! #ifdef UNISTD
          childpid = fork();
          if (childpid < 0)
--- 1020,1024 ----

! #ifdef HAVE_UNISTD_H
          childpid = fork();
          if (childpid < 0)
***************
*** 1107,1111 ****
              _exit(1);
          }
! #endif /* UNISTD */

  #ifdef MSW
--- 1113,1117 ----
              _exit(1);
          }
! #endif /* HAVE_UNISTD_H */

  #ifdef MSW

Index: g_bang.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v
retrieving revision 1.5.6.1
retrieving revision 1.5.6.2
diff -C2 -d -r1.5.6.1 -r1.5.6.2
*** g_bang.c	4 Nov 2007 18:00:20 -0000	1.5.6.1
--- g_bang.c	6 Jan 2008 03:27:53 -0000	1.5.6.2
***************
*** 6,9 ****
--- 6,10 ----
  /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */

+ #include "config.h"

  #include <stdlib.h>
***************
*** 17,24 ****
  #include <math.h>

  #ifdef MSW
  #include <io.h>
- #else
- #include <unistd.h>
  #endif

--- 18,27 ----
  #include <math.h>

+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
  #ifdef MSW
  #include <io.h>
  #endif

Index: u_pdsend.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_pdsend.c,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -C2 -d -r1.3 -r1.3.10.1
*** u_pdsend.c	16 Jul 2005 01:43:18 -0000	1.3
--- u_pdsend.c	6 Jan 2008 03:27:53 -0000	1.3.10.1
***************
*** 6,9 ****
--- 6,11 ----
  from its standard input to Pd via the netsend/netreceive ("FUDI") protocol. */

+ #include "config.h"
+ 
  #include <sys/types.h>
  #include <string.h>
***************
*** 11,14 ****
--- 13,21 ----
  #include <errno.h>
  #include <stdlib.h>
+ 
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
  #ifdef MSW
  #include <winsock.h>
***************
*** 19,23 ****
  #include <netdb.h>
  #include <stdio.h>
- #include <unistd.h>
  #define SOCKET_ERROR -1
  #endif
--- 26,29 ----

Index: g_numbox.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v
retrieving revision 1.8.6.1
retrieving revision 1.8.6.2
diff -C2 -d -r1.8.6.1 -r1.8.6.2
*** g_numbox.c	4 Nov 2007 18:00:20 -0000	1.8.6.1
--- g_numbox.c	6 Jan 2008 03:27:53 -0000	1.8.6.2
***************
*** 5,8 ****
--- 5,10 ----
  /* my_numbox.c written by Thomas Musil (c) IEM KUG Graz Austria 2000-2001 */

+ #include "config.h"
+ 
  #include <stdlib.h>
  #include <string.h>
***************
*** 15,22 ****
  #include <math.h>

  #ifdef MSW
  #include <io.h>
- #else
- #include <unistd.h>
  #endif

--- 17,26 ----
  #include <math.h>

+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
  #ifdef MSW
  #include <io.h>
  #endif