Fixed some issues found by winapi_check.

dlls/comctl32/commctrl.c

@@ -394,7 +394,7 @@ GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, LPINT lpInfo)
 
 
 /***********************************************************************
- * DrawStatusTextW [COMCTL32.28]
+ * DrawStatusTextW [COMCTL32.@]
  *
  * Draws text with borders, like in a status bar.
  *
@@ -446,7 +446,7 @@ void WINAPI DrawStatusTextW (HDC hdc, LPRECT lprc, LPCWSTR text, UINT style)
 
 
 /***********************************************************************
- * DrawStatusText  [COMCTL32.27]
+ * DrawStatusText  [COMCTL32.@]
  * DrawStatusTextA [COMCTL32.5]
  *
  * Draws text with borders, like in a status bar.
@@ -478,7 +478,7 @@ void WINAPI DrawStatusTextA (HDC hdc, LPRECT lprc, LPCSTR text, UINT style)
 
 
 /***********************************************************************
- * CreateStatusWindow  [COMCTL32.21]
+ * CreateStatusWindow  [COMCTL32.@]
  * CreateStatusWindowA [COMCTL32.6]
  *
  * Creates a status bar
@@ -505,7 +505,7 @@ CreateStatusWindowA (INT style, LPCSTR text, HWND parent, UINT wid)
 
 
 /***********************************************************************
- * CreateStatusWindowW [COMCTL32.22] Creates a status bar control
+ * CreateStatusWindowW [COMCTL32.@] Creates a status bar control
  *
  * PARAMS
  *     style  [I] window style
@@ -592,7 +592,7 @@ InitCommonControls (void)
 
 
 /***********************************************************************
- * InitCommonControlsEx [COMCTL32.84]
+ * InitCommonControlsEx [COMCTL32.@]
  *
  * Registers the common controls.
  *
@@ -675,7 +675,7 @@ InitCommonControlsEx (LPINITCOMMONCONTROLSEX lpInitCtrls)
 
 
 /***********************************************************************
- * CreateToolbarEx [COMCTL32.23] Creates a tool bar window
+ * CreateToolbarEx [COMCTL32.@] Creates a tool bar window
  *
  * PARAMS
  *     hwnd
@@ -896,7 +896,7 @@ CreateToolbar (HWND hwnd, DWORD style, UINT wID, INT nBitmaps,
 
 
 /***********************************************************************
- * DllGetVersion [COMCTL32.25]
+ * DllGetVersion [COMCTL32.@]
  *
  * Retrieves version information of the 'COMCTL32.DLL'
  *
@@ -932,7 +932,7 @@ COMCTL32_DllGetVersion (DLLVERSIONINFO *pdvi)
 }
 
 /***********************************************************************
- *		DllInstall (COMCTL32.26)
+ *		DllInstall (COMCTL32.@)
  */
 HRESULT WINAPI COMCTL32_DllInstall(BOOL bInstall, LPCWSTR cmdline)
 {
@@ -943,7 +943,7 @@ HRESULT WINAPI COMCTL32_DllInstall(BOOL bInstall, LPCWSTR cmdline)
 }
 
 /***********************************************************************
- * _TrackMouseEvent [COMCTL32.91]
+ * _TrackMouseEvent [COMCTL32.@]
  *
  * Requests notification of mouse events
  *
@@ -973,7 +973,7 @@ _TrackMouseEvent (TRACKMOUSEEVENT *ptme)
 }
 
 /*************************************************************************
- * GetMUILanguage [COMCTL32.39]
+ * GetMUILanguage [COMCTL32.@]
  *
  * FIXME: What's this supposed to do?  Apparently some i18n thing.
  *
@@ -985,7 +985,7 @@ LANGID WINAPI GetMUILanguage (VOID)
 
 
 /*************************************************************************
- * InitMUILanguage [COMCTL32.85]
+ * InitMUILanguage [COMCTL32.@]
  *
  * FIXME: What's this supposed to do?  Apparently some i18n thing.
  *

dlls/comctl32/flatsb.c

@@ -46,7 +46,7 @@ typedef struct
 
 
 /***********************************************************************
- *		InitializeFlatSB (COMCTL32.86)
+ *		InitializeFlatSB (COMCTL32.@)
  *
  *	returns nonzero if successful, zero otherwise
  *
@@ -59,7 +59,7 @@ BOOL WINAPI InitializeFlatSB(HWND hwnd)
 }
 
 /***********************************************************************
- *		UninitializeFlatSB (COMCTL32.90)
+ *		UninitializeFlatSB (COMCTL32.@)
  *
  *	returns:
  *	E_FAIL		if one of the scroll bars is currently in use
@@ -75,7 +75,7 @@ HRESULT WINAPI UninitializeFlatSB(HWND hwnd)
 }
 
 /***********************************************************************
- *		FlatSB_GetScrollProp (COMCTL32.32)
+ *		FlatSB_GetScrollProp (COMCTL32.@)
  *
  *	Returns nonzero if successful, or zero otherwise. If index is WSB_PROP_HSTYLE,
  *	the return is nonzero if InitializeFlatSB has been called for this window, or
@@ -91,7 +91,7 @@ FlatSB_GetScrollProp(HWND hwnd, INT propIndex, LPINT prop)
 }
 
 /***********************************************************************
- *		FlatSB_SetScrollProp (COMCTL32.36)
+ *		FlatSB_SetScrollProp (COMCTL32.@)
  */
 BOOL WINAPI
 FlatSB_SetScrollProp(HWND hwnd, UINT index, INT newValue, BOOL flag)
@@ -118,7 +118,7 @@ FlatSB_SetScrollProp(HWND hwnd, UINT index, INT newValue, BOOL flag)
  */
 
 /***********************************************************************
- *		FlatSB_EnableScrollBar (COMCTL32.29)
+ *		FlatSB_EnableScrollBar (COMCTL32.@)
  */
 BOOL WINAPI
 FlatSB_EnableScrollBar(HWND hwnd, int nBar, UINT flags)
@@ -127,7 +127,7 @@ FlatSB_EnableScrollBar(HWND hwnd, int nBar, UINT flags)
 }
 
 /***********************************************************************
- *		FlatSB_ShowScrollBar (COMCTL32.38)
+ *		FlatSB_ShowScrollBar (COMCTL32.@)
  */
 BOOL WINAPI
 FlatSB_ShowScrollBar(HWND hwnd, int nBar, BOOL fShow)
@@ -136,7 +136,7 @@ FlatSB_ShowScrollBar(HWND hwnd, int nBar, BOOL fShow)
 }
 
 /***********************************************************************
- *		FlatSB_GetScrollRange (COMCTL32.33)
+ *		FlatSB_GetScrollRange (COMCTL32.@)
  */
 BOOL WINAPI
 FlatSB_GetScrollRange(HWND hwnd, int nBar, LPINT min, LPINT max)
@@ -145,7 +145,7 @@ FlatSB_GetScrollRange(HWND hwnd, int nBar, LPINT min, LPINT max)
 }
 
 /***********************************************************************
- *		FlatSB_GetScrollInfo (COMCTL32.30)
+ *		FlatSB_GetScrollInfo (COMCTL32.@)
  */
 BOOL WINAPI
 FlatSB_GetScrollInfo(HWND hwnd, int nBar, LPSCROLLINFO info)
@@ -154,7 +154,7 @@ FlatSB_GetScrollInfo(HWND hwnd, int nBar, LPSCROLLINFO info)
 }
 
 /***********************************************************************
- *		FlatSB_GetScrollPos (COMCTL32.31)
+ *		FlatSB_GetScrollPos (COMCTL32.@)
  */
 INT WINAPI
 FlatSB_GetScrollPos(HWND hwnd, int nBar)
@@ -163,7 +163,7 @@ FlatSB_GetScrollPos(HWND hwnd, int nBar)
 }
 
 /***********************************************************************
- *		FlatSB_SetScrollPos (COMCTL32.35)
+ *		FlatSB_SetScrollPos (COMCTL32.@)
  */
 INT WINAPI
 FlatSB_SetScrollPos(HWND hwnd, int nBar, INT pos, BOOL bRedraw)
@@ -172,7 +172,7 @@ FlatSB_SetScrollPos(HWND hwnd, int nBar, INT pos, BOOL bRedraw)
 }
 
 /***********************************************************************
- *		FlatSB_SetScrollInfo (COMCTL32.34)
+ *		FlatSB_SetScrollInfo (COMCTL32.@)
  */
 INT WINAPI
 FlatSB_SetScrollInfo(HWND hwnd, int nBar, LPSCROLLINFO info, BOOL bRedraw)
@@ -181,7 +181,7 @@ FlatSB_SetScrollInfo(HWND hwnd, int nBar, LPSCROLLINFO info, BOOL bRedraw)
 }
 
 /***********************************************************************
- *		FlatSB_SetScrollRange (COMCTL32.37)
+ *		FlatSB_SetScrollRange (COMCTL32.@)
  */
 INT WINAPI
 FlatSB_SetScrollRange(HWND hwnd, int nBar, INT min, INT max, BOOL bRedraw)

dlls/comctl32/propsheet.c

@@ -2203,8 +2203,8 @@ static void PROPSHEET_CleanUp(HWND hwndDlg)
 }
 
 /******************************************************************************
- *            PropertySheet    (COMCTL32.87)
- *            PropertySheetA   (COMCTL32.88)
+ *            PropertySheet    (COMCTL32.@)
+ *            PropertySheetA   (COMCTL32.@)
  */
 INT WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh)
 {
@@ -2248,7 +2248,7 @@ INT WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh)
 }
 
 /******************************************************************************
- *            PropertySheetW   (COMCTL32.89)
+ *            PropertySheetW   (COMCTL32.@)
  */
 INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh)
 {
@@ -2292,8 +2292,8 @@ INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh)
 }
 
 /******************************************************************************
- *            CreatePropertySheetPage    (COMCTL32.18)
- *            CreatePropertySheetPageA   (COMCTL32.19)
+ *            CreatePropertySheetPage    (COMCTL32.@)
+ *            CreatePropertySheetPageA   (COMCTL32.@)
  */
 HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(
                           LPCPROPSHEETPAGEA lpPropSheetPage)
@@ -2322,7 +2322,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(
 }
 
 /******************************************************************************
- *            CreatePropertySheetPageW   (COMCTL32.20)
+ *            CreatePropertySheetPageW   (COMCTL32.@)
  */
 HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage)
 {
@@ -2357,7 +2357,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage
 }
 
 /******************************************************************************
- *            DestroyPropertySheetPage   (COMCTL32.24)
+ *            DestroyPropertySheetPage   (COMCTL32.@)
  */
 BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage)
 {
@@ -2799,4 +2799,3 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
   return FALSE;
 }
-

dlls/ntdll/sec.c

@@ -18,12 +18,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <ctype.h>
 #include <math.h>
-#include <pwd.h>
+#ifdef HAVE_PWD_H
+# include <pwd.h>
+#endif
 #include <unistd.h>
 
 #include "windef.h"

dlls/ntdll/signal_i386.c

@@ -416,7 +416,7 @@ typedef struct
 
 WINE_DEFAULT_DEBUG_CHANNEL(seh);
 
-typedef int (*wine_signal_handler)(unsigned sig);
+typedef int (*wine_signal_handler)(unsigned int sig);
 
 static wine_signal_handler handlers[256];
 
@@ -426,7 +426,7 @@ static sigset_t all_sigs;
 /***********************************************************************
  *           dispatch_signal
  */
-inline static int dispatch_signal(unsigned sig)
+inline static int dispatch_signal(unsigned int sig)
 {
     if (handlers[sig] == NULL) return 0;
     return handlers[sig](sig);
@@ -1086,7 +1086,7 @@ static int set_handler( int sig, int have_sigaltstack, void (*func)() )
 /***********************************************************************
  *           __wine_set_signal_handler   (NTDLL.@)
  */
-int __wine_set_signal_handler(unsigned sig, wine_signal_handler wsh)
+int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh)
 {
     if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1;
     if (handlers[sig] != NULL) return -2;

dlls/ntdll/signal_sparc.c

@@ -40,7 +40,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(seh);
 
-typedef int (*wine_signal_handler)(unsigned sig);
+typedef int (*wine_signal_handler)(unsigned int sig);
 
 static wine_signal_handler handlers[256];
 
@@ -50,7 +50,7 @@ static sigset_t all_sigs;
 /***********************************************************************
  *           dispatch_signal
  */
-inline static int dispatch_signal(unsigned sig)
+inline static int dispatch_signal(unsigned int sig)
 {
     if (handlers[sig] == NULL) return 0;
     return handlers[sig](sig);
@@ -363,7 +363,7 @@ static int set_handler( int sig, void (*func)() )
 /***********************************************************************
  *           __wine_set_signal_handler   (NTDLL.@)
  */
-int __wine_set_signal_handler(unsigned sig, wine_signal_handler wsh)
+int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh)
 {
     if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1;
     if (handlers[sig] != NULL) return -2;

dlls/ole32/compobj.c

@@ -477,6 +477,8 @@ HRESULT WINAPI __CLSIDFromStringA(
   return S_OK;
 }
 
+/*****************************************************************************/
+
 HRESULT WINAPI CLSIDFromString(
 	LPCOLESTR idstr,	/* [in] string representation of GUID */
 	CLSID *id )		/* [out] GUID represented by above string */

dlls/shlwapi/shlwapi.spec

@@ -700,7 +700,7 @@ init SHLWAPI_LibMain
 @ stdcall PathIsLFNFileSpecW(wstr) PathIsLFNFileSpecW
 @ stdcall PathFindSuffixArrayA(str ptr long) PathFindSuffixArrayA
 @ stdcall PathFindSuffixArrayW(wstr ptr long) PathFindSuffixArrayW
-@ stdcall _SHGetInstanceExplorer@4(ptr) _SHGetInstanceExplorer
+@ stdcall _SHGetInstanceExplorer(ptr) _SHGetInstanceExplorer
 @ stdcall PathUndecorateA(str) PathUndecorateA
 @ stdcall PathUndecorateW(wstr) PathUndecorateW
 @ stub    PathUnExpandEnvStringsA

dlls/shlwapi/thread.c

@@ -241,7 +241,9 @@ static DWORD WINAPI SHLWAPI_ThreadWrapper(PVOID pTi)
 }
 
 /*************************************************************************
- * SHCreateThread   [SHLWAPI.16]
+ *      @	[SHLWAPI.16]
+ *
+ * SHCreateThread
  *
  * Create a new thread.
  *

dlls/winedos/vga.c

@@ -775,7 +775,7 @@ void VGA_GetCharacterAtCursor(BYTE *ascii, BYTE *attr)
  */
 static void VGA_CopyFrameToWindow(void)
 {
-  //FIXME: add implementation
+  /* FIXME: add implementation */
 }
 
 /*
@@ -783,7 +783,7 @@ static void VGA_CopyFrameToWindow(void)
  */
 static void VGA_CopyWindowToFrame(void)
 {
-  //FIXME: fix implementation
+  /* FIXME: fix implementation */
   char *dat = DOSMEM_MapDosToLinear(0xa0000);
   memmove(vga_fb_data, dat, 65536);
 }

dlls/wininet/internet.c

@@ -1791,7 +1791,7 @@ BOOL WINAPI InternetUnlockRequestFile( HANDLE hLockHandle)
  *
  */
 
-BOOL InternetAutoDial(DWORD dwFlags, HWND hwndParent)
+BOOL WINAPI InternetAutoDial(DWORD dwFlags, HWND hwndParent)
 {
     FIXME("STUB\n");
 

dlls/winmm/winealsa/audio.c

@@ -31,7 +31,9 @@
 #include <errno.h>
 #include <limits.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif

dlls/winmm/winealsa/audio_05.c

@@ -29,7 +29,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif

dlls/winmm/wineaudioio/audio.c

@@ -45,7 +45,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif
@@ -201,7 +203,7 @@ LONG LIBAUDIOIO_WaveInit(void)
         spec[RECORD].precision=spec[PLAYBACK].precision=16 ;
         spec[RECORD].endian=spec[PLAYBACK].endian=ENDIAN_INTEL;
         spec[RECORD].disable_threads=spec[PLAYBACK].disable_threads=1;
-	spec[RECORD].type=spec[PLAYBACK].type=TYPE_SIGNED;       // in 16 bit mode this is what typical PC hardware expects
+	spec[RECORD].type=spec[PLAYBACK].type=TYPE_SIGNED; /* in 16 bit mode this is what typical PC hardware expects */
 
 	mode = O_WRONLY|O_NDELAY;
 
@@ -1204,7 +1206,7 @@ static	DWORD	wodGetNumDevs(void)
 }
 
 /**************************************************************************
- * 				wodMessage (WINEOSS.7)
+ * 				wodMessage (WINEAUDIOIO.@)
  */
 DWORD WINAPI LIBAUDIOIO_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
 			    DWORD dwParam1, DWORD dwParam2)
@@ -1398,7 +1400,9 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface,
 						      LPDWORD lpdwPlay, LPDWORD lpdwWrite)
 {
     ICOM_THIS(IDsDriverBufferImpl,iface);
-//    count_info info;
+#if 0
+    count_info info;
+#endif
     DWORD ptr;
 
     TRACE("(%p)\n",iface);
@@ -1564,7 +1568,9 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface,
     ICOM_THIS(IDsDriverImpl,iface);
     IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj;
     HRESULT err;
-//    audio_buf_info info;
+#if 0
+    audio_buf_info info;
+#endif
     int enable = 0;
 
     TRACE("(%p,%p,%lx,%lx)\n",iface,pwfx,dwFlags,dwCardAddress);
@@ -1592,7 +1598,7 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface,
 	return DSERR_GENERIC;
     }
 #endif
-    WOutDev[This->wDevID].maplen =64*1024; // Map 64 K at a time
+    WOutDev[This->wDevID].maplen =64*1024; /* Map 64 K at a time */
 
 #if 0
     (*ippdsdb)->buflen = info.fragstotal * info.fragsize;
@@ -2225,7 +2231,7 @@ static DWORD widGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize)
 }
 
 /**************************************************************************
- * 				widMessage (WINEOSS.6)
+ * 				widMessage (WINEAUDIOIO.@)
  */
 DWORD WINAPI LIBAUDIOIO_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
 			    DWORD dwParam1, DWORD dwParam2)
@@ -2260,7 +2266,7 @@ DWORD WINAPI LIBAUDIOIO_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
 #else /* HAVE_LIBAUDIOIO */
 
 /**************************************************************************
- * 				wodMessage (WINEOSS.7)
+ * 				wodMessage (WINEAUDIOIO.@)
  */
 DWORD WINAPI LIBAUDIOIO_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
 			    DWORD dwParam1, DWORD dwParam2)
@@ -2270,7 +2276,7 @@ DWORD WINAPI LIBAUDIOIO_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
 }
 
 /**************************************************************************
- * 				widMessage (WINEOSS.6)
+ * 				widMessage (WINEAUDIOIO.@)
  */
 DWORD WINAPI LIBAUDIOIO_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
 			    DWORD dwParam1, DWORD dwParam2)

dlls/winmm/winenas/audio.c

@@ -44,7 +44,9 @@
 #include <errno.h>
 #include <fcntl.h>
 
-//#define EMULATE_SB16
+#if 0
+#define EMULATE_SB16
+#endif
 #define FRAG_SIZE  1024
 #define FRAG_COUNT 10
 
@@ -180,7 +182,7 @@ static WINE_WAVEOUT	WOutDev   [MAX_WAVEOUTDRV];
 static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv);
 
 
-// NASFUNC
+/* NASFUNC */
 static AuBool event_handler(AuServer* aud, AuEvent* ev, AuEventHandlerRec* hnd);
 static int nas_init(void);
 static int nas_end(void);
@@ -753,13 +755,13 @@ static void wodPlayer_ProcessMessages(WINE_WAVEOUT* wwo)
 	    SetEvent(ev);
             break;
 	case WINE_WM_CLOSING:
-	    // sanity check: this should not happen since the device must have been reset before
+	    /* sanity check: this should not happen since the device must have been reset before */
 	    if (wwo->lpQueuePtr || wwo->lpPlayPtr) ERR("out of sync\n");
 	    wwo->hThread = 0;
 	    wwo->state = WINE_WS_CLOSED;
 	    SetEvent(ev);
 	    ExitThread(0);
-	    // shouldn't go here
+	    /* shouldn't go here */
 	default:
 	    FIXME("unknown message %d\n", msg);
 	    break;
@@ -1106,7 +1108,9 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize)
     if (lpTime == NULL)	return MMSYSERR_INVALPARAM;
 
     wwo = &WOutDev[wDevID];
-//    NAS_AddRingMessage(&wwo->msgRing, WINE_WM_UPDATE, 0, TRUE);
+#if 0
+    NAS_AddRingMessage(&wwo->msgRing, WINE_WM_UPDATE, 0, TRUE);
+#endif
     val = wwo->WrittenTotal;
 
     TRACE("wType=%04X wBitsPerSample=%u nSamplesPerSec=%lu nChannels=%u nAvgBytesPerSec=%lu\n",

files/profile.c

@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -27,7 +29,9 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <pwd.h>
+#ifdef HAVE_PWD_H
+# include <pwd.h>
+#endif
 #include <unistd.h>
 
 #include "windef.h"

scheduler/client.c

@@ -25,7 +25,9 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <pwd.h>
+#ifdef HAVE_PWD_H
+# include <pwd.h>
+#endif
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>