--- old/src/java.desktop/share/native/libjsound/SoundDefs.h 2020-05-20 18:01:56.500310674 -0700 +++ new/src/java.desktop/share/native/libjsound/SoundDefs.h 2020-05-20 18:01:56.112303224 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,10 +29,9 @@ // types for X_PLATFORM #define X_WINDOWS 1 -#define X_SOLARIS 2 -#define X_LINUX 3 -#define X_BSD 4 -#define X_MACOSX 5 +#define X_LINUX 2 +#define X_BSD 3 +#define X_MACOSX 4 // ********************************** // Make sure you set X_PLATFORM defines correctly. @@ -45,7 +44,7 @@ // following is needed for _LP64 -#if ((X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) || (X_PLATFORM == X_MACOSX)) +#if ((X_PLATFORM == X_LINUX) || (X_PLATFORM == X_MACOSX)) #include #endif @@ -115,11 +114,6 @@ #endif -#if X_PLATFORM == X_SOLARIS -#define INLINE -#endif - - #if X_PLATFORM == X_LINUX #define INLINE inline #endif