diff options
| author | Joakim Verona | 2010-08-27 10:58:44 +0200 |
|---|---|---|
| committer | Joakim Verona | 2010-08-27 10:58:44 +0200 |
| commit | 362120833bcbbaea94976b6701633e2ed75f6051 (patch) | |
| tree | 632690a24a934bb51a32303add5172d63b6b9e00 /lib-src/ntlib.h | |
| parent | 1800c4865b15a9e1154bf1f03d87d1aaf750a527 (diff) | |
| parent | 1a868076f51b5d6f1cf78117463e6f9c614551ec (diff) | |
| download | emacs-362120833bcbbaea94976b6701633e2ed75f6051.tar.gz emacs-362120833bcbbaea94976b6701633e2ed75f6051.zip | |
merge from trunk, fix conflicts
Diffstat (limited to 'lib-src/ntlib.h')
| -rw-r--r-- | lib-src/ntlib.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h index fd51269fdfd..4dd6a32ee32 100644 --- a/lib-src/ntlib.h +++ b/lib-src/ntlib.h | |||
| @@ -30,14 +30,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 30 | #ifdef sleep | 30 | #ifdef sleep |
| 31 | #undef sleep | 31 | #undef sleep |
| 32 | #endif | 32 | #endif |
| 33 | void sleep(unsigned long seconds); | 33 | void sleep (unsigned long seconds); |
| 34 | char *getwd (char *dir); | 34 | char *getwd (char *dir); |
| 35 | int getppid(void); | 35 | int getppid (void); |
| 36 | char * getlogin (); | 36 | char * getlogin (void); |
| 37 | char * cuserid (char * s); | 37 | char * cuserid (char * s); |
| 38 | unsigned getuid (); | 38 | unsigned getuid (void); |
| 39 | unsigned getegid (); | 39 | unsigned getegid (void); |
| 40 | unsigned getgid (); | 40 | unsigned getgid (void); |
| 41 | int setuid (unsigned uid); | 41 | int setuid (unsigned uid); |
| 42 | int setegid (unsigned gid); | 42 | int setegid (unsigned gid); |
| 43 | char * getpass (const char * prompt); | 43 | char * getpass (const char * prompt); |