diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2012-10-08 14:47:25 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2012-10-08 14:47:25 -0700 |
| commit | 51de26960c35ef707713d5c02568290d66578db3 (patch) | |
| tree | 2c5478875d03db06a97f7dc1ecf840280e2c5e45 /env_universal.cpp | |
| parent | b67526aae8a28a4870edc51ad46a002c6ecf0ecf (diff) | |
Make escaping consistent for fish <-> fishd protocol
Fix fork guards to work in fishd
https://github.com/fish-shell/fish-shell/issues/339
Diffstat (limited to 'env_universal.cpp')
| -rw-r--r-- | env_universal.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/env_universal.cpp b/env_universal.cpp index 3d12a222..7a1564ed 100644 --- a/env_universal.cpp +++ b/env_universal.cpp @@ -61,7 +61,7 @@ static int get_socket_count = 0; static wchar_t * path; static wchar_t *user; static void (*start_fishd)(); -static void (*external_callback)( int type, const wchar_t *name, const wchar_t *val ); +static void (*external_callback)( fish_message_type_t type, const wchar_t *name, const wchar_t *val ); /** Flag set to 1 when a barrier reply is recieved @@ -165,7 +165,7 @@ static int get_socket( int fork_ok ) /** Callback function used whenever a new fishd message is recieved */ -static void callback( int type, const wchar_t *name, const wchar_t *val ) +static void callback( fish_message_type_t type, const wchar_t *name, const wchar_t *val ) { if( type == BARRIER_REPLY ) { @@ -250,7 +250,7 @@ static void reconnect() void env_universal_init( wchar_t * p, wchar_t *u, void (*sf)(), - void (*cb)( int type, const wchar_t *name, const wchar_t *val )) + void (*cb)( fish_message_type_t type, const wchar_t *name, const wchar_t *val )) { path=p; user=u; |