diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-10-14 14:40:04 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-10-14 14:40:04 +0200 |
| commit | c11ef50378fd68d43fe40b21489493f0e9865626 (patch) | |
| tree | e581e3e0ab672938766b37c411d4561e2cadf509 /erts/emulator/drivers | |
| parent | b95bfc6c641a568f6ed5dc4ff9e80a742505744d (diff) | |
| parent | 77eba492997f8340425d0828835c2a60cf81550e (diff) | |
| download | otp-c11ef50378fd68d43fe40b21489493f0e9865626.tar.gz otp-c11ef50378fd68d43fe40b21489493f0e9865626.tar.bz2 otp-c11ef50378fd68d43fe40b21489493f0e9865626.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/drivers')
| -rw-r--r-- | erts/emulator/drivers/unix/ttsl_drv.c | 8 | ||||
| -rw-r--r-- | erts/emulator/drivers/win32/win_efile.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/drivers/unix/ttsl_drv.c b/erts/emulator/drivers/unix/ttsl_drv.c index 1e436830e7..491e0a090e 100644 --- a/erts/emulator/drivers/unix/ttsl_drv.c +++ b/erts/emulator/drivers/unix/ttsl_drv.c @@ -745,7 +745,7 @@ static Sint16 get_sint16(char *s) { return ((*s << 8) | ((byte*)s)[1]); } - + static int start_lbuf(void) { if (!lbuf && !(lbuf = ( Uint32*) driver_alloc(lbuf_size * sizeof(Uint32)))) @@ -1091,7 +1091,7 @@ static int move_cursor(int from, int to) move_left(-dc); return TRUE; } - + static int start_termcap(void) { int eres; @@ -1187,7 +1187,7 @@ static int move_down(int n) tputs(down, 1, outc); return TRUE; } - + /* * Updates cols if terminal has resized (SIGWINCH). Should be called @@ -1209,7 +1209,7 @@ static void update_cols(void) cols = width; } } - + /* * Put a terminal device into non-canonical mode with ECHO off. diff --git a/erts/emulator/drivers/win32/win_efile.c b/erts/emulator/drivers/win32/win_efile.c index b36a103f8e..319065f57b 100644 --- a/erts/emulator/drivers/win32/win_efile.c +++ b/erts/emulator/drivers/win32/win_efile.c @@ -1216,7 +1216,7 @@ int flags; return 1; } - + /* * is_root_unc_name - returns TRUE if the argument is a UNC name specifying * a root share. That is, if it is of the form \\server\share\. |