From: Vitaly Perov <vitperov@etersoft.ru>
Date: Fri, 10 Jun 2011 11:07:06 +0000 (+0400)
Subject: Merge eterwine into eterhack
X-Git-Tag: 1.3.16-alt1.1~3^2
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=391cd5119f1efc34bb968b792bffcdf96d6f1e0f;p=wine%2Feterwine.git

Merge eterwine into eterhack

Conflicts:
	include/config.h.in
---

391cd5119f1efc34bb968b792bffcdf96d6f1e0f
diff --cc dlls/winejack.drv/audio.c
index da04824af5,ac8a0c0668..5d339eeac8
--- a/dlls/winejack.drv/audio.c
+++ b/dlls/winejack.drv/audio.c
@@@ -34,6 -34,6 +34,7 @@@
   */
  
  #include "config.h"
++#include "wine/port.h"
  
  #include <stdlib.h>
  #include <stdarg.h>
@@@ -47,6 -47,6 +48,7 @@@
  #include "winbase.h"
  #include "winnls.h"
  #include "wingdi.h"
++#include "winuser.h"
  #include "winerror.h"
  #include "mmddk.h"
  #include "dsound.h"
diff --cc include/config.h.in
index fd0671dcd0,b7460cc000..403d85dde7
--- a/include/config.h.in
+++ b/include/config.h.in
@@@ -512,12 -503,6 +506,9 @@@
  /* Define to 1 if you have the <mpg123.h> header file. */
  #undef HAVE_MPG123_H
  
- /* Define if you have NAS including devel headers */
- #undef HAVE_NAS
- 
 +/* Define to 1 if you have the <ncursesw/ncurses.h> header file. */
 +#undef HAVE_NCURSESW_NCURSES_H
 +
  /* Define to 1 if you have the <ncurses.h> header file. */
  #undef HAVE_NCURSES_H