aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32.c
diff options
context:
space:
mode:
authorK. Handa2015-01-07 22:51:41 +0900
committerK. Handa2015-01-07 22:51:41 +0900
commit88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch)
tree18da116400703b67738bdbbd38cc4abf4c1e929f /src/w32.c
parent3f79d3131629f73da16ec121d2a0056f11b70e65 (diff)
parent95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff)
downloademacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz
emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/w32.c')
-rw-r--r--src/w32.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/w32.c b/src/w32.c
index 6dea0c2a811..31b13289b57 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1,6 +1,6 @@
1/* Utility and Unix shadow routines for GNU Emacs on the Microsoft Windows API. 1/* Utility and Unix shadow routines for GNU Emacs on the Microsoft Windows API.
2 2
3Copyright (C) 1994-1995, 2000-2014 Free Software Foundation, Inc. 3Copyright (C) 1994-1995, 2000-2015 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
@@ -242,8 +242,6 @@ typedef struct _REPARSE_DATA_BUFFER {
242typedef HRESULT (WINAPI * ShGetFolderPath_fn) 242typedef HRESULT (WINAPI * ShGetFolderPath_fn)
243 (IN HWND, IN int, IN HANDLE, IN DWORD, OUT char *); 243 (IN HWND, IN int, IN HANDLE, IN DWORD, OUT char *);
244 244
245Lisp_Object QCloaded_from;
246
247void globals_of_w32 (void); 245void globals_of_w32 (void);
248static DWORD get_rid (PSID); 246static DWORD get_rid (PSID);
249static int is_symlink (const char *); 247static int is_symlink (const char *);