Browse Source

Delete some redundant macros and typedefs.

A few internal source files were redeclaring types and macros also
declared in the external jack/types.h and jack/systemdeps.h headers.
Since the external header needs them, delete them from the internal
headers.
tags/v1.9.10
Basil Nutmeg Adrian Knoth 9 years ago
parent
commit
c5352804af
6 changed files with 4 additions and 69 deletions
  1. +1
    -6
      common/JackTypes.h
  2. +1
    -13
      macosx/JackCompilerDeps_os.h
  3. +2
    -16
      posix/JackCompilerDeps_os.h
  4. +0
    -2
      posix/JackTypes_os.h
  5. +0
    -31
      windows/JackCompilerDeps_os.h
  6. +0
    -1
      windows/JackTypes_os.h

+ 1
- 6
common/JackTypes.h View File

@@ -21,6 +21,7 @@
#ifndef __JackTypes__
#define __JackTypes__

#include "types.h"
#include "JackCompilerDeps.h"

typedef unsigned short UInt16;
@@ -34,12 +35,6 @@ typedef signed long SInt32;

#include "JackTypes_os.h"

/**
* Type used to represent the value of free running
* monotonic clock with units of microseconds.
*/
typedef uint64_t jack_time_t;

typedef uint16_t jack_int_t; // Internal type for ports and refnum

typedef enum {


+ 1
- 13
macosx/JackCompilerDeps_os.h View File

@@ -24,18 +24,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

#if __GNUC__

#define PRE_PACKED_STRUCTURE

#ifndef POST_PACKED_STRUCTURE
/* POST_PACKED_STRUCTURE needs to be a macro which
expands into a compiler directive. The directive must
tell the compiler to arrange the preceding structure
declaration so that it is packed on byte-boundaries rather
than use the natural alignment of the processor and/or
compiler.
*/
#define POST_PACKED_STRUCTURE __attribute__((__packed__))
#endif
#define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
#define LIB_EXPORT __attribute__((visibility("default")))
#ifdef SERVER_SIDE
@@ -47,7 +35,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#define MEM_ALIGN(x,y) x
#define LIB_EXPORT
#define SERVER_EXPORT
/* Add other things here for non-gcc platforms for PRE and POST_PACKED_STRUCTURE */
/* Add other things here for non-gcc platforms */
#endif

#endif


+ 2
- 16
posix/JackCompilerDeps_os.h View File

@@ -23,19 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "JackConstants.h"

#if __GNUC__
#define PRE_PACKED_STRUCTURE

#ifndef POST_PACKED_STRUCTURE
/* POST_PACKED_STRUCTURE needs to be a macro which
expands into a compiler directive. The directive must
tell the compiler to arrange the preceding structure
declaration so that it is packed on byte-boundaries rather
than use the natural alignment of the processor and/or
compiler.
*/
#define POST_PACKED_STRUCTURE __attribute__((__packed__))
#endif

#define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
#define LIB_EXPORT __attribute__((visibility("default")))
#ifdef SERVER_SIDE
@@ -53,9 +41,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#define LIB_EXPORT
#define SERVER_EXPORT

/* Add other things here for non-gcc platforms for PRE and POST_PACKED_STRUCTURE */
#define PRE_PACKED_STRUCTURE
#define POST_PACKED_STRUCTURE
/* Add other things here for non-gcc platforms */
#endif

#endif


+ 0
- 2
posix/JackTypes_os.h View File

@@ -26,8 +26,6 @@
typedef unsigned long long UInt64;
typedef pthread_key_t jack_tls_key;

typedef pthread_t jack_native_thread_t;

typedef int (*jack_thread_creator_t)(pthread_t*, const pthread_attr_t*, void* (*function)(void*), void* arg);

#endif

+ 0
- 31
windows/JackCompilerDeps_os.h View File

@@ -33,41 +33,10 @@

#define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
#define PRE_PACKED_STRUCTURE
#ifndef POST_PACKED_STRUCTURE
/* POST_PACKED_STRUCTURE needs to be a macro which
expands into a compiler directive. The directive must
tell the compiler to arrange the preceding structure
declaration so that it is packed on byte-boundaries rather
than use the natural alignment of the processor and/or
compiler.
*/
#define POST_PACKED_STRUCTURE __attribute__((__packed__))
#endif
#else

#define MEM_ALIGN(x,y) x
#ifdef _MSC_VER
#define PRE_PACKED_STRUCTURE1 __pragma(pack(push,1))
#define PRE_PACKED_STRUCTURE PRE_PACKED_STRUCTURE1
/* PRE_PACKED_STRUCTURE needs to be a macro which
expands into a compiler directive. The directive must
tell the compiler to arrange the following structure
declaration so that it is packed on byte-boundaries rather
than use the natural alignment of the processor and/or
compiler.
*/
#define POST_PACKED_STRUCTURE ;__pragma(pack(pop))
/* and POST_PACKED_STRUCTURE needs to be a macro which
restores the packing to its previous setting */
#else
/* Other Windows compilers to go here */
#define PRE_PACKED_STRUCTURE
#define POST_PACKED_STRUCTURE
#endif
#endif

#if defined(_MSC_VER) /* Added by JE - 31-01-2012 */


+ 0
- 1
windows/JackTypes_os.h View File

@@ -27,7 +27,6 @@ typedef ULONGLONG UInt64;
typedef UInt64 uint64_t;
typedef unsigned short uint16_t;
typedef DWORD jack_tls_key;
typedef HANDLE jack_native_thread_t;

#endif


Loading…
Cancel
Save