diff options
| author | Paul Berry <[email protected]> | 2013-02-06 09:50:22 -0800 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2013-02-08 06:51:22 -0800 |
| commit | a4b9678a5451465b7df8a7fd8acc1fa9c5300181 (patch) | |
| tree | 078f79863aba0302e75868a29dca29fbf71a808f /src/mesa/main/macros.h | |
| parent | dc92b2d11fb939cf2a0ef330559d49304086c10a (diff) | |
Consolidate some redundant definitions of ARRAY_SIZE() macro.
Previous to this patch, there were 13 identical definitions of this
macro in Mesa source. That's ridiculous. This patch consolidates 6
of them to a single definition in src/mesa/main/macros.h.
Unfortunately, I wasn't able to eliminate the remaining definitions,
since they occur in places that don't include src/mesa/main/macros.h:
- include/pci_ids/pci_id_driver_map.h
- src/egl/drivers/dri2/egl_dri2.h
- src/egl/main/egldefines.h
- src/gbm/main/backend.c
- src/gbm/main/gbm.c
- src/glx/glxclient.h
- src/mapi/mapi/stub.c
I'm open to suggestions as to how to deal with the remaining redundancy.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main/macros.h')
| -rw-r--r-- | src/mesa/main/macros.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index d1e81fe082c..f6d38fb6480 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -766,5 +766,8 @@ DIFFERENT_SIGNS(GLfloat x, GLfloat y) #define ENUM_TO_DOUBLE(E) ((GLdouble)(GLint)(E)) #define ENUM_TO_BOOLEAN(E) ((E) ? GL_TRUE : GL_FALSE) +/* Compute the size of an array */ +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) + #endif |