diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-08 15:07:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-08 15:07:46 +0200 |
| commit | b5a2c971202ff19079cb5a98253d8760ae124d15 (patch) | |
| tree | 451469af3bf1c7d9ce0236ba546867bbf6a2fb3a /X11/fonts/fontproto.h | |
| parent | 71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec (diff) | |
| parent | d435b20322433b335a4fc5693cce0399a3f27b2d (diff) | |
| download | vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.tar.gz vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.tar.bz2 vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/Xwindows.h
Diffstat (limited to 'X11/fonts/fontproto.h')
| -rw-r--r-- | X11/fonts/fontproto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/X11/fonts/fontproto.h b/X11/fonts/fontproto.h index 1ab8f3796..490629e1d 100644 --- a/X11/fonts/fontproto.h +++ b/X11/fonts/fontproto.h @@ -74,7 +74,7 @@ extern FontPtr CreateFontRec (void); extern void DestroyFontRec (FontPtr font); extern Bool _FontSetNewPrivate (FontPtr /* pFont */, int /* n */, - pointer /* ptr */); + void * /* ptr */); extern int AllocateFontPrivateIndex (void); extern void ResetFontPrivateIndex (void); |