diff options
| author | runge <runge> | 2006-01-08 19:29:21 +0000 |
|---|---|---|
| committer | runge <runge> | 2006-01-08 19:29:21 +0000 |
| commit | def301266373e462f4a5e90eab443087ccfc7ccc (patch) | |
| tree | 3ea30a545319b59c1c05cdc4a76174c876f76b23 | |
| parent | e781eea698377dd4132006742dd91da6e441c845 (diff) | |
| download | libvncserver-def301266373e462f4a5e90eab443087ccfc7ccc.zip libvncserver-def301266373e462f4a5e90eab443087ccfc7ccc.tar.gz | |
fix client non-jpeg/libz builds
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | examples/pnmshow24.c | 7 | ||||
| -rw-r--r-- | libvncclient/vncviewer.c | 4 | ||||
| -rw-r--r-- | libvncserver/main.c | 2 |
4 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2006-01-08 Karl Runge <runge@karlrunge.com> + * libvncclient/vncviewer.c: fix non-jpeg/libz builds. + * examples/pnmshow24.c: fix non-ALLOW24BPP builds. + * libvncserver/main.c: fix 'static int' defn. + 2006-01-05 Karl Runge <runge@karlrunge.com> * libvncserver/main.c: rfbRegisterProtocolExtension extMutex was never initialized. diff --git a/examples/pnmshow24.c b/examples/pnmshow24.c index b59b3b5..b44dc3e 100644 --- a/examples/pnmshow24.c +++ b/examples/pnmshow24.c @@ -3,8 +3,10 @@ #include <rfb/keysym.h> #ifndef LIBVNCSERVER_ALLOW24BPP -#error "I need the ALLOW24BPP flag to work" -#endif +int main() { + printf("I need the ALLOW24BPP LibVNCSever flag to work\n"); +} +#else static void HandleKey(rfbBool down,rfbKeySym key,rfbClientPtr cl) { @@ -88,3 +90,4 @@ int main(int argc,char** argv) return(0); } +#endif diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c index 02f66f1..a5ca15d 100644 --- a/libvncclient/vncviewer.c +++ b/libvncclient/vncviewer.c @@ -157,12 +157,12 @@ rfbClient* rfbGetClient(int bitsPerSample,int samplesPerPixel, #ifdef LIBVNCSERVER_HAVE_LIBZ client->raw_buffer_size = -1; client->decompStreamInited = FALSE; -#endif #ifdef LIBVNCSERVER_HAVE_LIBJPEG memset(client->zlibStreamActive,0,sizeof(rfbBool)*4); client->jpegSrcManager = NULL; #endif +#endif client->HandleCursorPos = DummyPoint; client->SoftCursorLockArea = DummyRect; @@ -252,6 +252,7 @@ rfbBool rfbInitClient(rfbClient* client,int* argc,char** argv) { } void rfbClientCleanup(rfbClient* client) { +#ifdef LIBVNCSERVER_HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBJPEG int i; @@ -272,6 +273,7 @@ void rfbClientCleanup(rfbClient* client) { if (client->jpegSrcManager) free(client->jpegSrcManager); #endif +#endif free(client->desktopName); free(client->serverHost); diff --git a/libvncserver/main.c b/libvncserver/main.c index 972ce6f..352a00e 100644 --- a/libvncserver/main.c +++ b/libvncserver/main.c @@ -61,7 +61,7 @@ void rfbRegisterProtocolExtension(rfbProtocolExtension* extension) { rfbProtocolExtension* last; - static extMutex_initialized = 0; + static int extMutex_initialized = 0; if (! extMutex_initialized) { INIT_MUTEX(extMutex); |
